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

.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>
maint
Junio C Hamano 2006-08-03 16:17:51 -07:00
parent c1f3089e4b
commit c8b87ef8b0
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -62,6 +62,7 @@ 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

2
Makefile
View File

@ -802,7 +802,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-resolve | git-merge-stupid | git-merge-recur | \
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" || \