diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2007-04-12 01:21:18 -0400 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2007-04-12 17:43:28 -0700 |
| commit | 9aef12673e966fcbefea7716239e159c03b8d94e (patch) | |
| tree | 59d68d1390271ae4d66cca2af5be8beacc489a30 | |
| parent | sscanf/strtoul: parse integers robustly (diff) | |
| download | tgif-9aef12673e966fcbefea7716239e159c03b8d94e.tar.xz | |
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 <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 $@ |