git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9092a96 95104c7)
Merge branch 'bc/fix-rebase-merge-skip' into maint
authorJunio C Hamano <redacted>
Wed, 16 Jul 2014 18:16:16 +0000 (11:16 -0700)
committerJunio C Hamano <redacted>
Wed, 16 Jul 2014 18:16:16 +0000 (11:16 -0700)
commit64630d807ae0a9717ae39c87bd1458bf15c62142
treeab4955b7e70e14600028aa4f7fd0d99f5579452atree | snapshot
parent9092a9696bee9a5729b7b1741a5de99aecb75552commit | diff
parent95104c7e257652b82aed089494def344e3938928commit | diff
Merge branch 'bc/fix-rebase-merge-skip' into maint

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
git-rebase--merge.sh diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT