From: Paolo Bonzini Date: Wed, 23 May 2007 05:07:54 +0000 (+0200) Subject: Document branch.autosetupmerge. X-Git-Tag: v1.5.2.1~18^2~1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9902387d20e7a73662a97f5c4b66ba4ec80dc9ce;p=git.git Document branch.autosetupmerge. This patch documents the branch.autosetupmerge config option, added by commit 0746d19a. Signed-off-by: Paolo Bonzini Signed-off-by: Junio C Hamano --- diff --git a/Documentation/config.txt b/Documentation/config.txt index c3fc64acc..6593f2e93 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -287,6 +287,13 @@ apply.whitespace:: Tells `git-apply` how to handle whitespaces, in the same way as the '--whitespace' option. See gitlink:git-apply[1]. +branch.autosetupmerge:: + Tells `git-branch' and `git-checkout' to setup new branches + so that gitlink:git-pull[1] will appropriately merge from that + remote branch. Note that even if this option is not set, + this behavior can be chosen per-branch using the `--track` + and `--no-track` options. This option defaults to false. + branch..remote:: When in branch , it tells `git fetch` which remote to fetch. If this option is not given, `git fetch` defaults to remote "origin".