aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-09-27 00:53:29 -0700
committerJunio C Hamano <junkio@cox.net>2006-09-27 00:53:29 -0700
commite9800b28c24465377dc2b8e26b322d362912647c (patch)
treea68c6d69a03497bd297c3a67238cd6e6b6fc505a /Makefile
parent244a0ae114824c8ca29bdc2148b98caaae39cac2 (diff)
parenteaf12a8c7d844be947c29954b658c17996abcd25 (diff)
downloadgit-e9800b28c24465377dc2b8e26b322d362912647c.tar.gz
git-e9800b28c24465377dc2b8e26b322d362912647c.tar.xz
Merge branch 'jc/lt-ref2-with-lt-refs' into jc/ref-locking
* jc/lt-ref2-with-lt-refs: Fix show-ref usage for --dereference. Document git-show-ref [-s|--hash] option. Add man page for git-show-ref gitignore: git-show-ref is a generated file. Use Linus' show ref in "git-branch.sh". Add [-s|--hash] option to Linus' show-ref. Teach "git checkout" to use git-show-ref Add "git show-ref" builtin command
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 54ac74e98..af4d68fd7 100644
--- a/Makefile
+++ b/Makefile
@@ -303,6 +303,7 @@ BUILTIN_OBJS = \
builtin-verify-pack.o \
builtin-write-tree.o \
builtin-zip-tree.o \
+ builtin-show-ref.o \
builtin-pack-refs.o
GITLIBS = $(LIB_FILE) $(XDIFF_LIB)