git-mirror

mirror of https://github.com/git/git.git synced 2026-06-09 15:37:49 +02:00

Files

T

Thiago Farina e78d01bf4e builtin/merge_recursive.c: Add an usage string and make use of it.

This improves the usage output by adding builtin_merge_recursive_usage string
that follows the same pattern used by the other builtin commands.

The previous output for git merger-recursive was:
usage: merge-recursive <base>... -- <head> <remote> ...

Now the output is:
usage: git merge-recursive <base>... -- <head> <remote> ...

Since cmd_merge_recursive is used to handle four different commands we need
the %s in the usage string, so the following example:

$ git merge-subtree -h

Will output:
usage: git merge-subtree <base>... -- <head> <remote> ...

Signed-off-by: Thiago Farina <tfransosi@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2010-09-03 09:37:10 -07:00

add.c

…

annotate.c

…

apply.c

Teach "apply --index-info" to handle rename patches

2010-07-23 14:44:38 -07:00

archive.c

…

bisect--helper.c

…

blame.c

Typos in code comments, an error message, documentation

2010-08-22 13:25:08 -07:00

branch.c

…

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ref-format.c

Allow "check-ref-format --branch" from subdirectory

2010-08-06 10:01:45 -07:00

checkout-index.c

…

checkout.c

checkout, commit: remove confusing assignments to rev.abbrev

2010-07-27 13:29:14 -07:00

clean.c

…

clone.c

…

commit-tree.c

…

commit.c

Merge branch 'jn/fix-abbrev' into maint

2010-08-20 12:53:09 -07:00

config.c

…

count-objects.c

…

describe.c

…

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

…

fast-export.c

…

fetch-pack.c

…

fetch.c

Merge branch 'dj/fetch-tagopt' into maint

2010-09-01 13:52:10 -07:00

fmt-merge-msg.c

…

for-each-ref.c

for-each-ref: fix objectname:short bug

2010-08-26 16:42:25 -07:00

fsck.c

…

gc.c

…

grep.c

…

hash-object.c

…

help.c

Cast execl*() NULL sentinels to (char *)

2010-07-25 23:14:18 -07:00

index-pack.c

index-pack: Don't follow replace refs.

2010-08-12 13:26:05 -07:00

init-db.c

…

log.c

Fix 'git log' early pager startup error case

2010-08-25 12:11:59 -07:00

ls-files.c

…

ls-remote.c

…

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

…

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

builtin/merge_recursive.c: Add an usage string and make use of it.

2010-09-03 09:37:10 -07:00

merge-tree.c

…

merge.c

…

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

…

notes.c

notes: allow --dry-run for -n and --verbose for -v

2010-08-09 10:12:50 -07:00

pack-objects.c

…

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

prune: allow --dry-run for -n and --verbose for -v

2010-08-09 10:13:18 -07:00

push.c

push: mention "git pull" in error message for non-fast forwards

2010-08-12 18:06:07 -07:00

read-tree.c

…

receive-pack.c

…

reflog.c

…

remote.c

…

replace.c

…

rerere.c

Merge branch 'sg/rerere-gc-old-still-used' into maint

2010-09-01 13:57:23 -07:00

reset.c

…

rev-list.c

…

rev-parse.c

…

revert.c

…

rm.c

…

send-pack.c

…

shortlog.c

…

show-branch.c

…

show-ref.c

…

stripspace.c

…

symbolic-ref.c

…

tag.c

…

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

…

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

var.c

…

verify-pack.c

…

verify-tag.c

…

write-tree.c

…