git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb8e23f 4415278)
Merge branch 'jc/combined' into maint
authorJunio C Hamano <redacted>
Fri, 27 Oct 2006 01:45:52 +0000 (18:45 -0700)
committerJunio C Hamano <redacted>
Fri, 27 Oct 2006 01:45:52 +0000 (18:45 -0700)
* jc/combined:
  combine-diff: honour --no-commit-id
  combine-diff: fix hunk_comment_line logic.
  combine-diff: a few more finishing touches.

1  2 
Documentation/diff-format.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/diff-format.txt
Simple merge
git clone https://git.99rst.org/PROJECT