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)
commit7df437e56b5a2c5ec7140dd097b517563db4972c
treea006f20b481d811ccb4846534ef6394be5bc78a8
parentff1e8bfcd69e5e0ee1a3167e80ef75b611f72123
parentbbb896d8e10f736bfda8f587c0009c358c9a8599
Merge branch 'maint'

* 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
Documentation/gitattributes.txt
Makefile