Skip to content

Commit

Permalink
Documentation: fix git-config.xml generation
Browse files Browse the repository at this point in the history
Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
James Bowes authored and Junio C Hamano committed May 24, 2007
1 parent 9902387 commit 5fdcf75
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Documentation/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down

0 comments on commit 5fdcf75

Please sign in to comment.