Merge branch 'jc/combined' into maint

* jc/combined:
combine-diff: honour --no-commit-id
combine-diff: fix hunk_comment_line logic.
combine-diff: a few more finishing touches.

diff --combined Documentation/diff-format.txt
index 2060ae2fcb9935ed11ecb71a093ad22c661339bf,ed4ebcbab76c23e599a3f3d62072e16d2cbe7cb1..e4520e28e53661159454e02c703be772d43bbc09
--- 1/Documentation/diff-format.txt
--- 2/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@@ -144,10 -144,8 +144,10 @@@ the file that rename/copy produces, res
         dissimilarity index <number>
         index <hash>..<hash> <mode>
  
 -3.  TAB, LF, and backslash characters in pathnames are
 -    represented as `\t`, `\n`, and `\\`, respectively.
 +3.  TAB, LF, double quote and backslash characters in pathnames
 +    are represented as `\t`, `\n`, `\"` and `\\`, respectively.
 +    If there is need for such substitution then the whole
 +    pathname is put in double quotes.
  
  
  combined diff format
@@@ -214,9 -212,9 +214,9 @@@ copying detection) are designed to wor
         --- a/file
         +++ b/file
  +
- Contrary to two-line header for traditional 'unified' diff
- format, and similar to filenames in ordinary "diff header",
- /dev/null is not used for creation or deletion.
+ Similar to two-line header for traditional 'unified' diff
+ format, `/dev/null` is used to signal created or deleted
+ files.
  
  4.   Chunk header format is modified to prevent people from
       accidentally feeding it to `patch -p1`. Combined diff format