| commit | 6293aea559b6c8f224f748e5a2a641ddb6cca55a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 2 Jul 2014 19:53:04 +0000 (2 12:53 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 2 Jul 2014 19:53:04 +0000 (2 12:53 -0700) | ||
| tree | 0d67ca045e0ffb1d92a1a11e3e7aa4b7e58cc6b3 | treesnapshot (tar.gz zip) |
| parent | 8061ae8b4618d69a67ff6cfb687d7044964d4b04 | commitdiff |
| parent | 95104c7e257652b82aed089494def344e3938928 | commitdiff |
Merge branch 'bc/fix-rebase-merge-skip'
"git rebase --skip" did not work well when it stopped due to a
conflict twice in a row.
* bc/fix-rebase-merge-skip:
rebase--merge: fix --skip with two conflicts in a row
"git rebase --skip" did not work well when it stopped due to a
conflict twice in a row.
* bc/fix-rebase-merge-skip:
rebase--merge: fix --skip with two conflicts in a row
| git-rebase--merge.sh | diff1 | diff2 | blobhistory |