summaryrefslogtreecommitdiff
path: root/git-merge-stupid.sh
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-04-12 05:21:18 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-13 00:43:28 (GMT)
commit9aef12673e966fcbefea7716239e159c03b8d94e (patch)
tree59d68d1390271ae4d66cca2af5be8beacc489a30 /git-merge-stupid.sh
parent6aead43db34313e6cdbc72e2f7a70f6b82c78cf2 (diff)
downloadgit-9aef12673e966fcbefea7716239e159c03b8d94e.zip
git-9aef12673e966fcbefea7716239e159c03b8d94e.tar.gz
git-9aef12673e966fcbefea7716239e159c03b8d94e.tar.bz2
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>
Diffstat (limited to 'git-merge-stupid.sh')
0 files changed, 0 insertions, 0 deletions