Miklos Vajna 5ed75e2a3f 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>

2012-09-14 10:04:29 -07:00

..

add.c

i18n: add: mark parseopt strings for translation

2012-08-20 12:23:15 -07:00

annotate.c

…

apply.c

Merge branch 'jc/apply-binary-p0'

2012-09-07 11:09:26 -07:00

archive.c

Reduce translations by using same terminologies

2012-08-22 12:02:28 -07:00

bisect--helper.c

i18n: bisect--helper: mark parseopt strings for translation

2012-08-20 12:23:15 -07:00

blame.c

Merge branch 'nd/i18n-parseopt-help'

2012-09-07 11:09:09 -07:00

branch.c

Merge branch 'jc/merge-bases'

2012-09-11 11:36:05 -07:00

bundle.c

…

cat-file.c

Merge branch 'nd/i18n-parseopt-help'

2012-09-07 11:09:09 -07:00

check-attr.c

i18n: check-attr: mark parseopt strings for translation

2012-08-20 12:23:15 -07:00

check-ref-format.c

…

checkout-index.c

Use imperative form in help usage to describe an action

2012-08-22 12:02:28 -07:00

checkout.c

Merge branch 'nd/i18n-parseopt-help'

2012-09-07 11:09:09 -07:00

clean.c

i18n: clean: mark parseopt strings for translation

2012-08-20 12:23:16 -07:00

clone.c

i18n: clone: mark parseopt strings for translation

2012-08-20 12:23:16 -07:00

column.c

i18n: column: mark parseopt strings for translation

2012-08-20 12:23:16 -07:00

commit-tree.c

Merge branch 'kk/maint-commit-tree'

2012-07-23 20:55:54 -07:00

commit.c

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

2012-09-14 10:04:29 -07:00

config.c

Merge branch 'nd/i18n-parseopt-help'

2012-09-07 11:09:09 -07:00

count-objects.c

i18n: count-objects: mark parseopt strings for translation

2012-08-20 12:23:16 -07:00

credential.c

…

describe.c

i18n: describe: mark parseopt strings for translation

2012-08-20 12:23:16 -07:00

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

Merge branch 'jk/maint-null-in-trees'

2012-08-27 11:54:28 -07:00

fast-export.c

i18n: fast-export: mark parseopt strings for translation

2012-08-20 12:23:16 -07:00

fetch-pack.c

fetch-pack: mention server version with verbose output

2012-08-13 21:56:05 -07:00

fetch.c

Merge branch 'jk/argv-array'

2012-09-11 11:36:18 -07:00

fmt-merge-msg.c

i18n: fmt-merge-msg: mark parseopt strings for translation

2012-08-20 12:23:17 -07:00

for-each-ref.c

Merge branch 'nd/i18n-parseopt-help'

2012-09-07 11:09:09 -07:00

fsck.c

i18n: fsck: mark parseopt strings for translation

2012-08-20 12:23:17 -07:00

gc.c

i18n: gc: mark parseopt strings for translation

2012-08-20 12:23:17 -07:00

grep.c

Merge branch 'nd/i18n-parseopt-help'

2012-09-07 11:09:09 -07:00

hash-object.c

i18n: hash-object: mark parseopt strings for translation

2012-08-20 12:23:17 -07:00

help.c

i18n: help: mark parseopt strings for translation

2012-08-20 12:23:17 -07:00

index-pack.c

i18n: mark more index-pack strings for translation

2012-08-31 13:05:05 -07:00

init-db.c

i18n: init-db: mark parseopt strings for translation

2012-08-20 12:23:17 -07:00

log.c

Merge branch 'mz/cherry-pick-cmdline-order'

2012-09-10 15:42:55 -07:00

ls-files.c

i18n: ls-files: mark parseopt strings for translation

2012-08-20 12:23:18 -07:00

ls-remote.c

…

ls-tree.c

i18n: ls-tree: mark parseopt strings for translation

2012-08-20 12:23:18 -07:00

mailinfo.c

commit/commit-tree: correct latin1 to utf-8

2012-08-21 16:10:53 -07:00

mailsplit.c

…

merge-base.c

Merge branch 'jc/merge-bases'

2012-09-11 11:36:05 -07:00

merge-file.c

i18n: merge-file: mark parseopt strings for translation

2012-08-20 12:23:18 -07:00

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

Merge branch 'nd/i18n-parseopt-help'

2012-09-07 11:09:09 -07:00

mktag.c

…

mktree.c

i18n: mktree: mark parseopt strings for translation

2012-08-20 12:23:18 -07:00

mv.c

i18n: mv: mark parseopt strings for translation

2012-08-20 12:23:18 -07:00

name-rev.c

i18n: name-rev: mark parseopt strings for translation

2012-08-20 12:23:18 -07:00

notes.c

Reduce translations by using same terminologies

2012-08-22 12:02:28 -07:00

pack-objects.c

i18n: pack-objects: mark parseopt strings for translation

2012-08-20 12:23:18 -07:00

pack-redundant.c

…

pack-refs.c

i18n: pack-refs: mark parseopt strings for translation

2012-08-20 12:23:19 -07:00

patch-id.c

…

prune-packed.c

i18n: prune-packed: mark parseopt strings for translation

2012-08-20 12:23:19 -07:00

prune.c

Merge branch 'nd/i18n-parseopt-help'

2012-09-07 11:09:09 -07:00

push.c

Merge branch 'nd/i18n-parseopt-help'

2012-09-07 11:09:09 -07:00

read-tree.c

i18n: read-tree: mark parseopt strings for translation

2012-08-20 12:23:19 -07:00

receive-pack.c

Merge branch 'jc/merge-bases'

2012-09-11 11:36:05 -07:00

reflog.c

…

remote-ext.c

…

remote-fd.c

…

remote.c

Merge branch 'nd/maint-remote-remove'

2012-09-12 14:21:58 -07:00

replace.c

i18n: replace: mark parseopt strings for translation

2012-08-20 12:23:19 -07:00

rerere.c

i18n: rerere: mark parseopt strings for translation

2012-08-20 12:23:19 -07:00

reset.c

i18n: reset: mark parseopt strings for translation

2012-08-20 12:23:19 -07:00

rev-list.c

…

rev-parse.c

Merge branch 'jc/dotdot-is-parent-directory'

2012-09-07 11:09:18 -07:00

revert.c

Merge branch 'mz/cherry-pick-cmdline-order'

2012-09-10 15:42:55 -07:00

rm.c

i18n: rm: mark parseopt strings for translation

2012-08-20 12:23:20 -07:00

send-pack.c

do not send client agent unless server does first

2012-08-10 12:35:13 -07:00

shortlog.c

i18n: shortlog: mark parseopt strings for translation

2012-08-20 12:23:20 -07:00

show-branch.c

i18n: show-branch: mark parseopt strings for translation

2012-08-22 10:58:28 -07:00

show-ref.c

i18n: show-ref: mark parseopt strings for translation

2012-08-22 10:58:28 -07:00

stripspace.c

…

symbolic-ref.c

i18n: symbolic-ref: mark parseopt strings for translation

2012-08-22 10:58:28 -07:00

tag.c

Reduce translations by using same terminologies

2012-08-22 12:02:28 -07:00

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

i18n: update-index: mark parseopt strings for translation

2012-08-22 10:58:29 -07:00

update-ref.c

Use imperative form in help usage to describe an action

2012-08-22 12:02:28 -07:00

update-server-info.c

i18n: update-server-info: mark parseopt strings for translation

2012-08-22 10:58:29 -07:00

upload-archive.c

…

var.c

…

verify-pack.c

i18n: verify-pack: mark parseopt strings for translation

2012-08-22 10:58:29 -07:00

verify-tag.c

i18n: verify-tag: mark parseopt strings for translation

2012-08-22 10:58:29 -07:00

write-tree.c

i18n: write-tree: mark parseopt strings for translation

2012-08-22 10:58:29 -07:00