Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'gl/cleanup' into gl/cleanup-next
[gitweb.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index 55cd9844d61e202670076968b20dcb0fda68732e..3da0e5e809cff8bf415fc95db494c0ff1d7b5526 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