From: Shawn O. Pearce Date: Thu, 12 Apr 2007 05:21:18 +0000 (-0400) Subject: Don't yap about merge-subtree during make X-Git-Tag: v1.5.2-rc0~59 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9aef12673e966fcbefea7716239e159c03b8d94e;p=git.git Don't yap about merge-subtree during make By default we are pretty quiet about the actual commands that we are running. So we should continue to be quiet about the new merge-subtree hardlink to merge-recursive. Technically this is not a builtin, but it is close because subtree is actually builtin to a non-builtin. So lets just make things easy and call it a builtin. Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano --- diff --git a/Makefile b/Makefile index a77d31de9..d6c5d596b 100644 --- a/Makefile +++ b/Makefile @@ -728,7 +728,7 @@ git$X: git.c common-cmds.h $(BUILTIN_OBJS) $(GITLIBS) GIT-CFLAGS help.o: common-cmds.h git-merge-subtree$X: git-merge-recursive$X - rm -f $@ && ln git-merge-recursive$X $@ + $(QUIET_BUILT_IN)rm -f $@ && ln git-merge-recursive$X $@ $(BUILT_INS): git$X $(QUIET_BUILT_IN)rm -f $@ && ln git$X $@