From: A Large Angry SCM <gitzilla@gmail.com>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: [PATCH] Stop making git-merge-recur
Date: Sun, 01 Oct 2006 19:45:06 -0700 [thread overview]
Message-ID: <45207D32.8040300@gmail.com> (raw)
Git-merge-recur is no longer installed and make clean no longer
removes it, so creating making it.
Signed-off-by: A Large Angry SCM <gitzilla@gmail.com>
---
Makefile | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index dd33158..37bd59d 100644
--- a/Makefile
+++ b/Makefile
@@ -586,8 +586,7 @@ export prefix TAR INSTALL DESTDIR SHELL_
### Build rules
-all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk gitweb/gitweb.cgi \
- git-merge-recur$X
+all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk gitweb/gitweb.cgi
all: perl/Makefile
$(MAKE) -C perl
@@ -603,9 +602,6 @@ git$X: git.c common-cmds.h $(BUILTIN_OBJ
help.o: common-cmds.h
-git-merge-recur$X: git-merge-recursive$X
- rm -f $@ && ln git-merge-recursive$X $@
-
$(BUILT_INS): git$X
rm -f $@ && ln git$X $@
@@ -918,7 +914,7 @@ check-docs::
do \
case "$$v" in \
git-merge-octopus | git-merge-ours | git-merge-recursive | \
- git-merge-resolve | git-merge-stupid | git-merge-recur | \
+ git-merge-resolve | git-merge-stupid | \
git-merge-recursive-old | \
git-ssh-pull | git-ssh-push ) continue ;; \
esac ; \
next reply other threads:[~2006-10-02 2:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-02 2:45 A Large Angry SCM [this message]
2006-10-02 2:49 ` [PATCH] Stop making git-merge-recur A Large Angry SCM
2006-10-02 4:41 ` Junio C Hamano
2006-10-02 4:52 ` A Large Angry SCM
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=45207D32.8040300@gmail.com \
--to=gitzilla@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.