@matheusbsbs / matheus-bagliano / commits / 9902387d20
Fork 0

Document branch.autosetupmerge.

This patch documents the branch.autosetupmerge config option, added by commit 0746d19a. Signed-off-by: Paolo Bonzini <bonzini@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Paolo Bonzini committed May 23, 2007 at 07:07 UTC 9902387d20e7a73662a97f5c4b66ba4ec80dc9ce
1 file changed +7
Documentation/config.txt
+7
@@ -287,6 +287,13 @@ apply.whitespace::
287 Tells `git-apply` how to handle whitespaces, in the same way
288 as the '--whitespace' option. See gitlink:git-apply[1].
289
290 +branch.autosetupmerge::
291 + Tells `git-branch' and `git-checkout' to setup new branches
292 + so that gitlink:git-pull[1] will appropriately merge from that
293 + remote branch. Note that even if this option is not set,
294 + this behavior can be chosen per-branch using the `--track`
295 + and `--no-track` options. This option defaults to false.
296 +
297 branch.<name>.remote::
298 When in branch <name>, it tells `git fetch` which remote to fetch.
299 If this option is not given, `git fetch` defaults to remote "origin".