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 /builtin.h | |
| parent | Merge branch 'sb/format-patch-parseopt' into sb/opt-filename (diff) | |
| parent | mktree: validate entry type in input (diff) | |
| download | git-3d09e64ac10aab1ae6ae1ac9cce7a6ebb43f2e50.tar.gz git-3d09e64ac10aab1ae6ae1ac9cce7a6ebb43f2e50.zip | |
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 'builtin.h')
| -rw-r--r-- | builtin.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -72,6 +72,7 @@ extern int cmd_merge_base(int argc, const char **argv, const char *prefix); extern int cmd_merge_ours(int argc, const char **argv, const char *prefix); extern int cmd_merge_file(int argc, const char **argv, const char *prefix); extern int cmd_merge_recursive(int argc, const char **argv, const char *prefix); +extern int cmd_mktree(int argc, const char **argv, const char *prefix); extern int cmd_mv(int argc, const char **argv, const char *prefix); extern int cmd_name_rev(int argc, const char **argv, const char *prefix); extern int cmd_pack_objects(int argc, const char **argv, const char *prefix); |