Convert memcpy(a,b,20) to hashcpy(a,b).

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 6e973b3d4bd107fb77df6b9394b87a7b79d96e0e..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
@@ -125,6 +126,7 @@ git-verify-tag
 git-whatchanged
 git-write-tree
 git-core-*/?*
+gitweb/gitweb.cgi
 test-date
 test-delta
 test-dump-cache-tree