• Junio C Hamano's avatar
    Merge branch 'bc/fix-rebase-merge-skip' · 6293aea5
    Junio C Hamano authored
    "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
    6293aea5
git-rebase--merge.sh 3.72 KB