From: Paolo Bonzini Date: Wed, 23 May 2007 05:07:54 GMT Subject: [PATCH] Document branch.autosetupmerge. Message-ID: <4653CC2A.5070202@lu.unisi.ch> In-Reply-To: <7vwsz05qcq.fsf@assigned-by-dhcp.cox.net> This patch documents the branch.autosetupmerge config option, adding in commit 0746d19a. Signed-Off-By: Paolo Bonzini --- config.txt | 7 +++++++ 1 files changed, 7 insertions(+) > I notice that Paolo did not update Documentation/config.txt > when he add this feature with 0746d19a; care to send in a patch > to correct this? Sure. Paolo. diff --git a/Documentation/config.txt b/Documentation/config.txt index 179cb17..de3c276 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -280,4 +280,11 @@ 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::