diff --git a/.gitignore b/.gitignore
index 2bcc604afea1871b2783a8768a1078572899b92f..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-ssh-upload
git-status
git-stripspace
+git-svn
git-svnimport
git-symbolic-ref
git-tag
git-whatchanged
git-write-tree
git-core-*/?*
+gitweb/gitweb.cgi
test-date
test-delta
test-dump-cache-tree
*.[ao]
*.py[co]
config.mak
+autom4te.cache
+config.log
+config.status
+config.mak.autogen
+config.mak.append
+configure
git-blame