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>
Junio C Hamano committed
Feb 6, 2007 at 21:27 UTC
6506e156d99bd406661cd5d2e502db7c0960d716
2 files changed
+2
-7
.gitignore
-1
@@ -72,7 +72,6 @@ git-merge-tree
72
git-merge-octopus
73
git-merge-one-file
74
git-merge-ours
75
-git-merge-recur
75
git-merge-recursive
76
git-merge-resolve
77
git-merge-stupid
Makefile
+2
-6
@@ -219,8 +219,7 @@ BUILT_INS = \
219
$(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))
220
221
# what 'all' will build and 'install' will install, in gitexecdir
222
-ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS) \
223
- git-merge-recur$X
222
+ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)
223
224
# Backward compatibility -- to be removed after 1.0
225
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
626
627
help.o: common-cmds.h
628
630
-git-merge-recur$X: git-merge-recursive$X
631
- rm -f $@ && ln git-merge-recursive$X $@
632
-
629
$(BUILT_INS): git$X
630
rm -f $@ && ln git$X $@
631
@@ -936,7 +932,7 @@ check-docs::
932
do \
933
case "$$v" in \
934
git-merge-octopus | git-merge-ours | git-merge-recursive | \
939
- git-merge-resolve | git-merge-stupid | git-merge-recur | \
935
+ git-merge-resolve | git-merge-stupid | \
936
git-ssh-pull | git-ssh-push ) continue ;; \
937
esac ; \
938
test -f "Documentation/$$v.txt" || \