aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2009-09-09 07:38:58 -0400
committerJunio C Hamano <gitster@pobox.com>2009-09-11 21:33:20 -0700
commit75194438f412714f4e82ca01e9038dc6714498c4 (patch)
treefdb94ce1638902652ab77a84d7ffa9271f2fe47a /Makefile
parent6ea71fe7d36cf5b81c2100d97a822ecf0bc04746 (diff)
downloadgit-75194438f412714f4e82ca01e9038dc6714498c4.tar.gz
git-75194438f412714f4e82ca01e9038dc6714498c4.tar.xz
push: make non-fast-forward help message configurable
This message is designed to help new users understand what has happened when refs fail to push. However, it does not help experienced users at all, and significantly clutters the output, frequently dwarfing the regular status table and making it harder to see. This patch introduces a general configuration mechanism for optional messages, with this push message as the first example. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index a61434756..9d9ff45fb 100644
--- a/Makefile
+++ b/Makefile
@@ -397,6 +397,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
@@ -454,6 +455,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