aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-05-23 22:34:11 -0700
committerJunio C Hamano <junkio@cox.net>2007-05-23 22:34:11 -0700
commitbaf5597ae43398e485f63f8e9216d34b5cd0a0d6 (patch)
tree33ea7dad9837b80af11f55972eec722a2d961a51
parent7ca055f75ad7ffd2251d4b607fbb86d7bcfd77c7 (diff)
parent5fdcf75c68d2c382de54af4e55713ca770bb9031 (diff)
downloadgit-baf5597ae43398e485f63f8e9216d34b5cd0a0d6.tar.gz
git-baf5597ae43398e485f63f8e9216d34b5cd0a0d6.tar.xz
Merge branch 'maint-1.5.1' into maint
* maint-1.5.1: Documentation: fix git-config.xml generation
-rw-r--r--Documentation/config.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index c1306a69e..fdb71de9f 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`