Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sat, 18 Oct 2008 15:26:44 +0000 (08:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 18 Oct 2008 15:26:44 +0000 (08:26 -0700)
commit58e0fa5416c0a91761d904fd097c2ba9e45e3654
tree595dd91831f6bd88448b62eea08a208346cd0814
parentf4a75a416f62c0494e06cb42a11c7cc70ec9303e
parentf430c8e44d0548e844d817fc32be7c38b2b6856c
Merge branch 'maint'

* maint:
  Hopefully the final draft release notes update before 1.6.0.3
  diff(1): clarify what "T"ypechange status means
  contrib: update packinfo.pl to not use dashed commands
  force_object_loose: Fix memory leak
  tests: shell negation portability fix
Documentation/diff-options.txt
sha1_file.c