From: James Bowes Date: Wed, 23 May 2007 22:16:12 +0000 (-0400) Subject: Documentation: fix git-config.xml generation X-Git-Tag: v1.5.2.1~18^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5fdcf75c68d2c382de54af4e55713ca770bb9031;p=git.git Documentation: fix git-config.xml generation Signed-off-by: James Bowes Signed-off-by: Junio C Hamano --- diff --git a/Documentation/config.txt b/Documentation/config.txt index 6593f2e93..65ed64a45 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -288,7 +288,7 @@ apply.whitespace:: as the '--whitespace' option. See gitlink:git-apply[1]. branch.autosetupmerge:: - Tells `git-branch' and `git-checkout' to setup new branches + 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`