diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-27 00:08:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-27 00:08:22 (GMT) |
| commit | c7f72248e3da96299d925aece0f00a46f5f86334 (patch) | |
| tree | ed5a248dd1c9815517f435fb491b8c2e469e9795 /Makefile | |
| parent | 0f7a8f2dba5aeb8ce8ab4a710a1d1310705f7f08 (diff) | |
| parent | 1e7abc593d55bc436ccd98f6815d49b13511baa1 (diff) | |
| download | git-c7f72248e3da96299d925aece0f00a46f5f86334.zip git-c7f72248e3da96299d925aece0f00a46f5f86334.tar.gz git-c7f72248e3da96299d925aece0f00a46f5f86334.tar.bz2 | |
Merge branch 'jc/no-slim-shell'
* jc/no-slim-shell:
Revert "Build-in "git-shell""
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -549,7 +549,6 @@ BUILTIN_OBJS += builtin-rev-parse.o BUILTIN_OBJS += builtin-revert.o BUILTIN_OBJS += builtin-rm.o BUILTIN_OBJS += builtin-send-pack.o -BUILTIN_OBJS += builtin-shell.o BUILTIN_OBJS += builtin-shortlog.o BUILTIN_OBJS += builtin-show-branch.o BUILTIN_OBJS += builtin-show-ref.o @@ -832,6 +831,7 @@ EXTLIBS += -lz ifndef NO_POSIX_ONLY_PROGRAMS PROGRAMS += git-daemon$X PROGRAMS += git-imap-send$X + PROGRAMS += git-shell$X endif ifndef NO_OPENSSL OPENSSL_LIBSSL = -lssl |