kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Shawn O. Pearce 2007-04-12 01:21:18 -04:00 committed by Junio C Hamano
parent 6aead43db3
commit 9aef12673e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -728,7 +728,7 @@ git$X: git.c common-cmds.h $(BUILTIN_OBJS) $(GITLIBS) GIT-CFLAGS
help.o: common-cmds.h help.o: common-cmds.h


git-merge-subtree$X: git-merge-recursive$X 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 $(BUILT_INS): git$X
$(QUIET_BUILT_IN)rm -f $@ && ln git$X $@ $(QUIET_BUILT_IN)rm -f $@ && ln git$X $@