mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
.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>
This commit is contained in:
parent
c1f3089e4b
commit
c8b87ef8b0
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -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
|
||||
|
|
2
Makefile
2
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" || \
|
||||
|
|
Loading…
Reference in a new issue