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 ; \ - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Mon Oct 02 12:45:25 2006
This archive was generated by hypermail 2.1.8 : 2006-10-02 12:46:09 EST