Merge branch 'jc/combined'

* jc/combined:
combine-diff: honour --no-commit-id
combine-diff: fix hunk_comment_line logic.

diff --cc combine-diff.c
Simple merge