Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
.gitignore: git-merge-recur is a built file.
[gitweb.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index fb0fa3f16a7c8a42c5d0d1be62666cc4ea4c6575..2299e36ba9b61f081a96ce6b28f94974311d721c 100644
(file)
--- 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