Merge branch 'maint'

* maint:
Add reference for status letters in documentation.
Document that git-log takes --all-match.
Update draft 1.6.0.4 release notes

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

diff --cc diffcore.h
Simple merge