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

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>
maint
Junio C Hamano 2007-02-06 21:27:09 -08:00
parent 740afd9613
commit 6506e156d9
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -72,7 +72,6 @@ git-merge-tree
git-merge-octopus git-merge-octopus
git-merge-one-file git-merge-one-file
git-merge-ours git-merge-ours
git-merge-recur
git-merge-recursive git-merge-recursive
git-merge-resolve git-merge-resolve
git-merge-stupid git-merge-stupid

8
Makefile
View File

@ -219,8 +219,7 @@ BUILT_INS = \
$(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS)) $(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))


# what 'all' will build and 'install' will install, in gitexecdir # what 'all' will build and 'install' will install, in gitexecdir
ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS) \ ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)
git-merge-recur$X


# Backward compatibility -- to be removed after 1.0 # Backward compatibility -- to be removed after 1.0
PROGRAMS += git-ssh-pull$X git-ssh-push$X 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 help.o: common-cmds.h


git-merge-recur$X: git-merge-recursive$X
rm -f $@ && ln git-merge-recursive$X $@

$(BUILT_INS): git$X $(BUILT_INS): git$X
rm -f $@ && ln git$X $@ rm -f $@ && ln git$X $@


@ -936,7 +932,7 @@ check-docs::
do \ do \
case "$$v" in \ case "$$v" in \
git-merge-octopus | git-merge-ours | git-merge-recursive | \ 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 ;; \ git-ssh-pull | git-ssh-push ) continue ;; \
esac ; \ esac ; \
test -f "Documentation/$$v.txt" || \ test -f "Documentation/$$v.txt" || \