Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Nov 2008 00:36:40 +0000 (16:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Nov 2008 00:36:40 +0000 (16:36 -0800)
* maint:
  Add reference for status letters in documentation.
  Document that git-log takes --all-match.
  Update draft 1.6.0.4 release notes

1  2 
Documentation/rev-list-options.txt
diffcore.h

Simple merge
diff --cc diffcore.h
Simple merge