From: Miklos Vajna <vmiklos@suse.cz>
Date: Fri, 14 Sep 2012 06:52:03 +0000 (+0200)
Subject: cherry-pick: don't forget -s on failure
X-Git-Tag: v1.8.0-rc0~37^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5ed75e2a3fb30f93fea7772e481ec6091e9a2c5f?hp=5ed75e2a3fb30f93fea7772e481ec6091e9a2c5f

cherry-pick: don't forget -s on failure

In case 'git cherry-pick -s <commit>' failed, the user had to use 'git
commit -s' (i.e. state the -s option again), which is easy to forget
about.  Instead, write the signed-off-by line early, so plain 'git
commit' will have the same result.

Also update 'git commit -s', so that in case there is already a relevant
Signed-off-by line before the Conflicts: line, it won't add one more at
the end of the message. If there is no such line, then add it before the
the Conflicts: line.

Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---