projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5e7c0c 40701ad)
Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Oct 2012 21:54:25 +0000 (14:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Oct 2012 21:54:33 +0000 (14:54 -0700)
* maint:
  attr: a note about the order of .gitattributes lookup

1  2 
Documentation/gitattributes.txt patch | diff1 | diff2 | blob | history

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