Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sun, 31 Aug 2008 03:31:39 +0000 (20:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 31 Aug 2008 03:31:39 +0000 (20:31 -0700)
* maint:
gitattributes: -crlf is not binary
git-apply: Loosen "match_beginning" logic
Fix example in git-name-rev documentation
shell: do not play duplicated definition games to shrink the executable
Fix use of hardlinks in "make install"
pack-objects: Allow missing base objects when creating thin packs

1  2 
Documentation/gitattributes.txt
Makefile
Simple merge
diff --cc Makefile
Simple merge