diff options
| author | James Bowes <jbowes@dangerouslyinc.com> | 2007-05-23 18:16:12 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-23 17:48:42 -0700 |
| commit | 5fdcf75c68d2c382de54af4e55713ca770bb9031 (patch) | |
| tree | 1634f0299d60c2e73a3a26240dff0bb297f5ff66 /Documentation | |
| parent | 9902387d20e7a73662a97f5c4b66ba4ec80dc9ce (diff) | |
| download | git-5fdcf75c68d2c382de54af4e55713ca770bb9031.tar.gz git-5fdcf75c68d2c382de54af4e55713ca770bb9031.tar.xz | |
Documentation: fix git-config.xml generation
Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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` |