diff options
| author |  Miklos Vajna <vmiklos@suse.cz> | 2012-09-14 08:52:03 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-09-14 10:04:29 -0700 |
| commit | 5ed75e2a3fb30f93fea7772e481ec6091e9a2c5f (patch) | |
| tree | ea0dc3f146a6a31dcb166dc3310376a1c8ddecc9 /builtin/unpack-objects.c | |
| parent | Merge git://github.com/git-l10n/git-po (diff) | |
| download | tgif-5ed75e2a3fb30f93fea7772e481ec6091e9a2c5f.tar.xz | |
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>
Diffstat (limited to 'builtin/unpack-objects.c')
0 files changed, 0 insertions, 0 deletions