My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9092a96 95104c7)
Merge branch 'bc/fix-rebase-merge-skip' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2014 18:16:16 +0000 (11:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2014 18:16:16 +0000 (11:16 -0700)
During "git rebase --merge", a conflicted patch could not be
skipped with "--skip" if the next one also conflicted.

* 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
The core git plumbing