diff options
author | Junio C Hamano <junkio@cox.net> | 2006-10-26 02:07:18 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-10-26 02:07:18 -0700 |
commit | af70fa4f48fdb12fef49c8bf2abc507f80081bf3 (patch) | |
tree | 4911444b5861d8d71b026b41ffe34301f837693e /builtin-unpack-objects.c | |
parent | e893f7ad73d387afc582d7eb063d57a88be4663d (diff) | |
parent | 44152787bcb4fd003d1f5b8c2a7591445cee8f20 (diff) | |
download | git-af70fa4f48fdb12fef49c8bf2abc507f80081bf3.tar.gz |
Merge branch 'jc/combined'
* jc/combined:
combine-diff: honour --no-commit-id
combine-diff: fix hunk_comment_line logic.
Diffstat (limited to 'builtin-unpack-objects.c')
0 files changed, 0 insertions, 0 deletions