]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Sep 2010 16:39:08 +0000 (09:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Sep 2010 16:39:08 +0000 (09:39 -0700)
* maint:
  config.txt: fix placement of diff.noprefix

1  2 
Documentation/config.txt

Simple merge