| commit | 64630d807ae0a9717ae39c87bd1458bf15c62142 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 16 Jul 2014 18:16:16 +0000 (16 11:16 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 16 Jul 2014 18:16:16 +0000 (16 11:16 -0700) | ||
| tree | ab4955b7e70e14600028aa4f7fd0d99f5579452a | treesnapshot (tar.gz zip) |
| parent | 9092a9696bee9a5729b7b1741a5de99aecb75552 | commitdiff |
| parent | 95104c7e257652b82aed089494def344e3938928 | commitdiff |
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
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
| git-rebase--merge.sh | diff1 | diff2 | blobhistory |