]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit6293aea559b6c8f224f748e5a2a641ddb6cca55a
tree0d67ca045e0ffb1d92a1a11e3e7aa4b7e58cc6b3tree | snapshot
parent8061ae8b4618d69a67ff6cfb687d7044964d4b04commit | diff
parent95104c7e257652b82aed089494def344e3938928commit | diff
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
git-rebase--merge.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.