aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-09-13 01:33:18 -0700
committerJunio C Hamano <gitster@pobox.com>2009-09-13 01:33:18 -0700
commitdc1b0c06ee9b3d2fb086a89e5b12da35bf360e4c (patch)
tree4097a3e7f1507c66ef4effc9d2da243c6382a3ed /Makefile
parent8b54f63dce34c3bbd7ff919fb53c1c253221fe71 (diff)
parentedf563fbaa2ab50734db4a61e9092f25fbb5a417 (diff)
downloadgit-dc1b0c06ee9b3d2fb086a89e5b12da35bf360e4c.tar.gz
git-dc1b0c06ee9b3d2fb086a89e5b12da35bf360e4c.tar.xz
Merge branch 'jk/unwanted-advices'
* jk/unwanted-advices: status: make "how to stage" messages optional push: make non-fast-forward help message configurable
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 01eea770d..d4958b832 100644
--- a/Makefile
+++ b/Makefile
@@ -400,6 +400,7 @@ export PERL_PATH
LIB_FILE=libgit.a
XDIFF_LIB=xdiff/lib.a
+LIB_H += advice.h
LIB_H += archive.h
LIB_H += attr.h
LIB_H += blob.h
@@ -457,6 +458,7 @@ LIB_H += utf8.h
LIB_H += wt-status.h
LIB_OBJS += abspath.o
+LIB_OBJS += advice.o
LIB_OBJS += alias.o
LIB_OBJS += alloc.o
LIB_OBJS += archive.o