Junio C Hamano 2d143e1a30 Merge branch 'mv/cherry-pick-s' into next ...

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 people often forgot to do so.

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

2012-09-14 21:46:25 -07:00

..

add.c

Merge branch 'rj/path-cleanup' into next

2012-09-11 11:46:46 -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 'jc/maint-blame-no-such-path' into next

2012-09-14 12:50:36 -07:00

branch.c

Merge branch 'rj/path-cleanup' into next

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

bundle.c

Teach progress eye-candy to fetch_refs_from_bundle()

2011-09-19 11:07:21 -07:00

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

Change check_refname_format() to reject unnormalized refnames

2011-10-05 13:45:30 -07:00

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/checkout-option-parsing-fix' into next

2012-09-11 11:50:21 -07:00

clean.c

i18n: clean: mark parseopt strings for translation

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

clone.c

Merge branch 'rj/path-cleanup' into next

2012-09-11 11:46:46 -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

git credential fill: output the whole 'struct credential'

2012-06-25 11:56:24 -07:00

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: eliminate spurious error messages

2012-09-12 11:46:32 -07:00

fetch.c

Merge branch 'nd/fetch-status-alignment' into next

2012-09-14 21:46:16 -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 'jc/maint-log-grep-all-match' (early part) into next

2012-09-14 12:51:01 -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-remote: document the '--get-url' option

2012-09-07 10:58:35 -07:00

ls-tree.c

i18n: ls-tree: mark parseopt strings for translation

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

mailinfo.c

Merge branch 'jc/mailinfo-RE' into next

2012-09-12 14:54:28 -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

patch-id.c: use strbuf instead of a fixed buffer

2011-09-22 09:35:07 -07:00

prune-packed.c

i18n: prune-packed: mark parseopt strings for translation

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

prune.c

Merge branch 'rj/path-cleanup' into next

2012-09-11 11:46:46 -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

reflog: remove i18n legos in pruning message

2012-06-07 11:49:16 -07:00

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

Merge branch 'jk/maint-reflog-walk-count-vs-time' into maint

2012-05-14 11:46:16 -07:00

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

Update documentation for stripspace

2011-12-12 16:48:54 -08:00

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

remove superfluous newlines in error messages

2012-04-30 15:45:51 -07:00

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

upload-archive: use start_command instead of fork

2011-11-21 14:32:40 -08:00

var.c

ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT

2012-05-24 17:16:41 -07:00

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