From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Dec 2008 08:14:14 +0000 (-0800)
Subject: Merge branch 'js/rebase-i-p'
X-Git-Tag: v1.6.1~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=768c728e7c706ab8d39e0dbf2aa4d1a465930728;p=git.git

Merge branch 'js/rebase-i-p'

* js/rebase-i-p:
  rebase -i -p: leave a --cc patch when a merge could not be redone
  rebase -i -p: Fix --continue after a merge could not be redone
  Show a failure of rebase -p if the merge had a conflict
---

768c728e7c706ab8d39e0dbf2aa4d1a465930728