From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Sep 2012 21:36:00 +0000 (-0700)
Subject: Merge branch 'mv/cherry-pick-s'
X-Git-Tag: v1.8.0-rc0~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3387423870e2efbc0b1bf7478a03320e55d2f0bc;p=thirdparty%2Fgit.git

Merge branch 'mv/cherry-pick-s'

After "git cherry-pick -s" gave control back to the user asking
help to resolve conflicts, concluding "git commit" needs to be run
with "-s" if the user wants to sign it off, but the command should
be able to remember that.

* mv/cherry-pick-s:
  cherry-pick: don't forget -s on failure
---

3387423870e2efbc0b1bf7478a03320e55d2f0bc