diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-25 01:04:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-25 01:04:10 -0700 |
| commit | 3d09e64ac10aab1ae6ae1ac9cce7a6ebb43f2e50 (patch) | |
| tree | 0b87c675f6495e45bec4fb2b16fd84b235460a5e /git.c | |
| parent | 8a17595899ac49a24128db76a80fbb35da487845 (diff) | |
| parent | 31c8221acb7c7acaea6ce2c680c2985581ce0066 (diff) | |
| download | git-3d09e64ac10aab1ae6ae1ac9cce7a6ebb43f2e50.tar.gz | |
Merge branch 'jc/mktree' into sb/opt-filename
* jc/mktree:
mktree: validate entry type in input
mktree --batch: build more than one tree object
mktree --missing: updated usage message and man page
mktree --missing: allow missing objects
t1010: add mktree test
mktree: do not barf on a submodule commit
builtin-mktree.c: use a helper function to handle one line of input
mktree: use parse-options
build-in git-mktree
Diffstat (limited to 'git.c')
| -rw-r--r-- | git.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -327,6 +327,7 @@ static void handle_internal_command(int argc, const char **argv) { "merge-ours", cmd_merge_ours, RUN_SETUP }, { "merge-recursive", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE }, { "merge-subtree", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE }, + { "mktree", cmd_mktree, RUN_SETUP }, { "mv", cmd_mv, RUN_SETUP | NEED_WORK_TREE }, { "name-rev", cmd_name_rev, RUN_SETUP }, { "pack-objects", cmd_pack_objects, RUN_SETUP }, |