diff options
author | Junio C Hamano <junkio@cox.net> | 2006-10-26 18:45:52 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-10-26 18:45:52 -0700 |
commit | ac1a1f9927b01df6c50a1e29d92c6e79e2daadff (patch) | |
tree | 06475e2ffc028329193d2f0227033072fa54c57c /git-applymbox.sh | |
parent | fb8e23fae2ac9af831260079b14eabad316f3769 (diff) | |
parent | 44152787bcb4fd003d1f5b8c2a7591445cee8f20 (diff) | |
download | git-ac1a1f9927b01df6c50a1e29d92c6e79e2daadff.tar.gz |
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.
Diffstat (limited to 'git-applymbox.sh')
0 files changed, 0 insertions, 0 deletions