projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 485cfd1 c598c5a)
Merge branch 'fa/maint-config-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 11 May 2012 18:15:53 +0000 (11:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 May 2012 18:15:53 +0000 (11:15 -0700)
By Florian Achleitner
* fa/maint-config-doc:
  Documentation/git-config: describe and clarify "--local <file>" option

1  2 
Documentation/git-config.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/git-config.txt
Simple merge
Git—the stupid content tracker