diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-16 22:16:16 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-16 22:16:16 +0400 |
| commit | 64630d807ae0a9717ae39c87bd1458bf15c62142 (patch) | |
| tree | ab4955b7e70e14600028aa4f7fd0d99f5579452a /merge-recursive.c | |
| parent | 9092a9696bee9a5729b7b1741a5de99aecb75552 (diff) | |
| parent | 95104c7e257652b82aed089494def344e3938928 (diff) | |
Merge branch 'bc/fix-rebase-merge-skip' into maint
During "git rebase --merge", a conflicted patch could not be
skipped with "--skip" if the next one also conflicted.
* bc/fix-rebase-merge-skip:
rebase--merge: fix --skip with two conflicts in a row
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions