From: Junio C Hamano <junkio@cox.net>
Date: Thu, 3 Aug 2006 23:17:51 +0000 (-0700)
Subject: .gitignore: git-merge-recur is a built file.
X-Git-Tag: v1.4.3-rc1~174^2~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c8b87ef8b0da6b08a19ed4f98eb58f46748af1e9;p=git.git

.gitignore: git-merge-recur is a built file.

Also it is OK to omit the documentation for it at least for now.

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

diff --git a/.gitignore b/.gitignore
index fb0fa3f16..2299e36ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,7 @@ 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 b7a095f0d..81d26a088 100644
--- a/Makefile
+++ b/Makefile
@@ -802,7 +802,7 @@ check-docs::
 	do \
 		case "$$v" in \
 		git-merge-octopus | git-merge-ours | git-merge-recursive | \
-		git-merge-resolve | git-merge-stupid | \
+		git-merge-resolve | git-merge-stupid | git-merge-recur | \
 		git-ssh-pull | git-ssh-push ) continue ;; \
 		esac ; \
 		test -f "Documentation/$$v.txt" || \