git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-05-01 21:59:56 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Merge branch 'maint-1.5.1' into maint

Browse Source 
* maint-1.5.1:
  Documentation: fix git-config.xml generation
This commit is contained in:
Junio C Hamano
2007-05-23 22:34:11 -07:00
parent 7ca055f75a 5fdcf75c68
commit baf5597ae4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config.txt
View File

@@ -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`