projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe31b2a d1e1fe7)
Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:09:01 +0000 (11:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:09:01 +0000 (11:09 -0700)
* mh/maint-config-doc-proxy-command:
  git-config doc: unconfuse an example
  git-config.txt: fix example

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

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