Merge branch 'jn/conf'

diff --git a/.gitignore b/.gitignore
index 65aa939f6b2bafe5bf7c55bf38456eb28b4df0a3..6e973b3d4bd107fb77df6b9394b87a7b79d96e0e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+GIT-CFLAGS
 GIT-VERSION-FILE
 git
 git-add
@@ -45,6 +46,7 @@ git-http-push
 git-imap-send
 git-index-pack
 git-init-db
+git-instaweb
 git-local-fetch
 git-log
 git-lost-found
@@ -105,6 +107,7 @@ git-ssh-push
 git-ssh-upload
 git-status
 git-stripspace
+git-svn
 git-svnimport
 git-symbolic-ref
 git-tag
@@ -134,4 +137,10 @@ git-core.spec
 *.[ao]
 *.py[co]
 config.mak
+autom4te.cache
+config.log
+config.status
+config.mak.autogen
+config.mak.append
+configure
 git-blame