diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index d49994903e..d99372afc4 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 @@ -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" || \ |