Merge branch 'alex'

[nbd.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index ec0cea5..054a216 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,7 @@ autom4te.cache
 autoscan.log
 config.h
 *~
-config.log
-config.status
+config.*
 file
 nbd-client.8
 nbd-server.1
@@ -19,8 +18,19 @@ mkinstalldirs
 nbd-tester-client
 nbd-client
 nbd-server
-doc
+doc/doxygen-output
 nbd-server.config
 nbd-server.5
-nbd.h
 *.o
+nbd-client.8.in
+nbd-server.1.in
+nbd-server.5.in
+Makefile.in
+config.h.in
+aclocal.m4
+INSTALL
+depcomp
+install-sh
+configure
+man/*.sh
+man/*.sh.in