diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-28 13:43:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-28 13:43:10 -0800 |
| commit | 58c58c8624d77ff4087ad93e515402db218684f6 (patch) | |
| tree | 33dea809419b810a9688e763bcf7ecdf63fd8cf6 /xdiff/xmerge.c | |
| parent | 2f739695700e4a9d9de640ff623fe4e728f5b23a (diff) | |
| parent | ef88ad238779c4eadba9f179146fe213f047b89f (diff) | |
| download | git-58c58c8624d77ff4087ad93e515402db218684f6.tar.gz git-58c58c8624d77ff4087ad93e515402db218684f6.tar.xz | |
Merge branch 'jc/maint-rebase-rewrite-last-skip' into maint
* jc/maint-rebase-rewrite-last-skip:
rebase --skip: correctly wrap-up when skipping the last patch
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions