]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8061ae8 95104c7)
Merge branch 'bc/fix-rebase-merge-skip'
authorJunio C Hamano <gitster@pobox.com>
Wed, 2 Jul 2014 19:53:04 +0000 (12:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Jul 2014 19:53:04 +0000 (12:53 -0700)
"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

1  2 
git-rebase--merge.sh patch | diff1 | diff2 | blob | history

diff --cc git-rebase--merge.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.