diff --git a/.gitignore b/.gitignore
index fb0fa3f16a7c8a42c5d0d1be62666cc4ea4c6575..3da0e5e809cff8bf415fc95db494c0ff1d7b5526 100644 (file)
--- a/.gitignore
+++ b/.gitignore
git-merge-octopus
git-merge-one-file
git-merge-ours
+git-merge-recur
git-merge-recursive
git-merge-resolve
git-merge-stupid
git-whatchanged
git-write-tree
git-core-*/?*
+gitweb/gitweb.cgi
test-date
test-delta
test-dump-cache-tree
autom4te.cache
config.log
config.status
-config.mak.in
config.mak.autogen
+config.mak.append
configure
git-blame