Files
git/git-rebase--merge.sh
Junio C Hamano 6293aea559 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
2014-07-02 12:53:04 -07:00

3.7 KiB