diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-31 16:17:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-31 16:17:11 -0700 |
| commit | 128b0c08cac16373b361726eebe72d5d5050b9c2 (patch) | |
| tree | 3bd384377865104b28583059f349eec58a2e4f1d /Makefile | |
| parent | 22cdab5b3f93dc21ab29ab3a46c4ec0f0c3f0869 (diff) | |
| parent | 31c8221acb7c7acaea6ce2c680c2985581ce0066 (diff) | |
| download | git-128b0c08cac16373b361726eebe72d5d5050b9c2.tar.gz | |
Merge branch 'jc/mktree'
* 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 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -336,7 +336,6 @@ PROGRAMS += git-index-pack$X PROGRAMS += git-merge-index$X PROGRAMS += git-merge-tree$X PROGRAMS += git-mktag$X -PROGRAMS += git-mktree$X PROGRAMS += git-pack-redundant$X PROGRAMS += git-patch-id$X PROGRAMS += git-shell$X @@ -590,6 +589,7 @@ BUILTIN_OBJS += builtin-merge-base.o BUILTIN_OBJS += builtin-merge-file.o BUILTIN_OBJS += builtin-merge-ours.o BUILTIN_OBJS += builtin-merge-recursive.o +BUILTIN_OBJS += builtin-mktree.o BUILTIN_OBJS += builtin-mv.o BUILTIN_OBJS += builtin-name-rev.o BUILTIN_OBJS += builtin-pack-objects.o |