| commit | 01f81f5078e5435cf0bbc438f78b985b34310be4 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 Jun 2014 20:37:39 +0000 (20 13:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 Jun 2014 20:37:39 +0000 (20 13:37 -0700) | ||
| tree | 8f7ce54dbb0a630ca13818f7fb4885e5345b3b88 | treesnapshot (tar.gz zip) |
| parent | ddaa722229fa7e86fbcd77aa642a54b8ba551617 | commitdiff |
| parent | 95104c7e257652b82aed089494def344e3938928 | commitdiff |
Merge branch 'bc/fix-rebase-merge-skip' into next
"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 |