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

diff --cc Documentation/diff-options.txt
Simple merge

diff --cc sha1_file.c
Simple merge