From: Junio C Hamano <junkio@cox.net>
Date: Wed, 7 Feb 2007 05:27:09 +0000 (-0800)
Subject: Remove git-merge-recur
X-Git-Tag: v1.5.0-rc4~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6506e156d99bd406661cd5d2e502db7c0960d716;p=git.git

Remove git-merge-recur

This was useful when the current recursive was in development, and
the original Python version was still called git-merge-recursive.

Now the synonym has served us well, it is time to move on.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/.gitignore b/.gitignore
index d49994903..d99372afc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,7 +72,6 @@ git-merge-tree
 git-merge-octopus
 git-merge-one-file
 git-merge-ours
-git-merge-recur
 git-merge-recursive
 git-merge-resolve
 git-merge-stupid
diff --git a/Makefile b/Makefile
index 2407bbee4..5d31e6d46 100644
--- a/Makefile
+++ b/Makefile
@@ -219,8 +219,7 @@ BUILT_INS = \
 	$(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))
 
 # what 'all' will build and 'install' will install, in gitexecdir
-ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS) \
-	git-merge-recur$X
+ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)
 
 # Backward compatibility -- to be removed after 1.0
 PROGRAMS += git-ssh-pull$X git-ssh-push$X
@@ -627,9 +626,6 @@ git$X: git.c common-cmds.h $(BUILTIN_OBJS) $(GITLIBS) GIT-CFLAGS
 
 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 $@
 
@@ -936,7 +932,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-ssh-pull | git-ssh-push ) continue ;; \
 		esac ; \
 		test -f "Documentation/$$v.txt" || \