diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-01-09 00:50:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-09 17:57:03 -0800 |
| commit | 71dfbf224ff980f4085f75868dc409118418731e (patch) | |
| tree | a15941410daa08629a9678b821c595c311372fed /Makefile | |
| parent | Don't die in git-http-fetch when fetching packs. (diff) | |
| download | tgif-71dfbf224ff980f4085f75868dc409118418731e.tar.xz | |
Make merge-base a built-in.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -194,7 +194,6 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ PROGRAMS = \ git-convert-objects$X git-fetch-pack$X git-fsck-objects$X \ git-hash-object$X git-index-pack$X git-local-fetch$X \ - git-merge-base$X \ git-daemon$X \ git-merge-index$X git-mktag$X git-mktree$X git-patch-id$X \ git-peek-remote$X git-receive-pack$X \ @@ -289,6 +288,7 @@ BUILTIN_OBJS = \ builtin-ls-tree.o \ builtin-mailinfo.o \ builtin-mailsplit.o \ + builtin-merge-base.o \ builtin-merge-file.o \ builtin-mv.o \ builtin-name-rev.o \ |