eyecatchu/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-12 13:53:11 +09:00
Code Issues Packages Projects Releases Wiki Activity
git/builtin
History
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
git add: Add the "--ignore-missing" option for the dry run
2010-07-12 15:13:54 -07:00
annotate.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
apply.c
Teach "apply --index-info" to handle rename patches
2010-07-23 14:44:38 -07:00
archive.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
bisect--helper.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
blame.c
Typos in code comments, an error message, documentation
2010-08-22 13:25:08 -07:00
branch.c
Merge branch 'sm/branch-broken-ref'
2010-06-21 06:02:47 -07:00
bundle.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
cat-file.c
Merge branch 'cp/textconv-cat-file'
2010-06-27 12:07:55 -07:00
check-attr.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
check-ref-format.c
Allow "check-ref-format --branch" from subdirectory
2010-08-06 10:01:45 -07:00
checkout-index.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
checkout.c
checkout, commit: remove confusing assignments to rev.abbrev
2010-07-27 13:29:14 -07:00
clean.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
clone.c
Merge branch 'ph/clone-message-reword'
2010-06-18 11:16:53 -07:00
commit-tree.c
make commit_tree a library function
2010-04-01 23:53:54 -07:00
commit.c
Merge branch 'jn/fix-abbrev' into maint
2010-08-20 12:53:09 -07:00
config.c
Allow passing of configuration parameters in the command line
2010-03-28 09:48:25 -07:00
count-objects.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
describe.c
Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' into maint
2010-06-16 16:21:15 -07:00
diff-files.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
diff-index.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
diff-tree.c
Merge branch 'pb/log-first-parent-p-m'
2010-03-24 16:25:39 -07:00
diff.c
Merge branch 'jc/diff-merge-base-multi'
2010-07-16 15:45:35 -07:00
fast-export.c
string_list: Fix argument order for string_list_append
2010-06-27 10:06:52 -07:00
fetch-pack.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
fetch.c
Merge branch 'dj/fetch-tagopt' into maint
2010-09-01 13:52:10 -07:00
fmt-merge-msg.c
Merge branch 'jp/string-list-api-cleanup'
2010-06-30 11:55:38 -07:00
for-each-ref.c
for-each-ref: fix objectname:short bug
2010-08-26 16:42:25 -07:00
fsck.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
gc.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
grep.c
Merge branch 'jn/grep-open'
2010-07-15 12:07:18 -07:00
hash-object.c
Merge branch 'lt/deepen-builtin-source'
2010-03-10 15:25:18 -08:00
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
handle "git --bare init <dir>" properly
2010-05-10 11:25:37 -07:00
log.c
Fix 'git log' early pager startup error case
2010-08-25 12:11:59 -07:00
ls-files.c
Merge branch 'jp/string-list-api-cleanup'
2010-06-30 11:55:38 -07:00
ls-remote.c
ls-remote: print URL when no repo is specified
2010-05-11 22:55:44 -07:00
ls-tree.c
ls: remove redundant logic
2010-03-21 16:23:44 -07:00
mailinfo.c
enums: omit trailing comma for portability
2010-05-31 16:59:27 -07:00
mailsplit.c
string_list: Fix argument order for string_list_insert
2010-06-27 10:06:51 -07:00
merge-base.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
merge-file.c
Merge branch 'rs/diff-no-minimal' into maint
2010-06-21 05:38:50 -07:00
merge-index.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
merge-ours.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
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-tree: fix where two branches share no changes
2010-07-14 12:56:49 -07:00
merge.c
Merge branch 'tc/merge-m-log'
2010-06-18 11:16:54 -07:00
mktag.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
mktree.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
mv.c
string_list: Fix argument order for string_list_insert
2010-06-27 10:06:51 -07:00
name-rev.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
notes.c
notes: allow --dry-run for -n and --verbose for -v
2010-08-09 10:12:50 -07:00
pack-objects.c
Merge branch 'np/malloc-threading' into maint
2010-06-16 16:21:06 -07:00
pack-redundant.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
pack-refs.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
patch-id.c
patch-id: Add support for mbox format
2010-04-19 13:01:49 -07:00
prune-packed.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
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
Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fix
2010-07-08 18:55:50 -07:00
receive-pack.c
Merge branch 'tr/receive-pack-aliased-update-fix' into maint
2010-07-07 10:25:15 -07:00
reflog.c
Merge branch 'jc/maint-no-reflog-expire-unreach-for-head'
2010-05-21 04:02:18 -07:00
remote.c
Merge branch 'jp/string-list-api-cleanup'
2010-06-30 11:55:38 -07:00
replace.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
rerere.c
Merge branch 'sg/rerere-gc-old-still-used' into maint
2010-09-01 13:57:23 -07:00
reset.c
Sync with 1.7.0.4
2010-03-31 15:14:27 -07:00
rev-list.c
rev-list: introduce --count option
2010-06-12 09:39:06 -07:00
rev-parse.c
Merge branch 'maint'
2010-07-07 11:18:26 -07:00
revert.c
revert: do not rebuild argv on heap
2010-06-29 10:36:13 -07:00
rm.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
send-pack.c
Merge branch 'ld/push-porcelain'
2010-03-15 00:58:24 -07:00
shortlog.c
string_list: Fix argument order for string_list_append
2010-06-27 10:06:52 -07:00
show-branch.c
show-branch: use DEFAULT_ABBREV instead of 7
2010-05-25 09:48:49 -07:00
show-ref.c
string_list: Fix argument order for string_list_insert
2010-06-27 10:06:51 -07:00
stripspace.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
symbolic-ref.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
tag.c
tag -v: use RUN_GIT_CMD to run verify-tag
2010-04-17 12:40:19 -07:00
tar-tree.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
unpack-file.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
unpack-objects.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
update-index.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
update-ref.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
update-server-info.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
upload-archive.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
var.c
Merge branch 'lt/deepen-builtin-source'
2010-03-10 15:25:18 -08:00
verify-pack.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
verify-tag.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00
write-tree.c
Move 'builtin-*' into a 'builtin/' subdirectory
2010-02-22 14:29:41 -08:00