Merge branch 'alex'

[nbd.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index ac7b3e9..054a216 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,10 @@
 .deps
 Makefile
-Makefile.in
-aclocal.m4
 autom4te.cache
 autoscan.log
 config.h
-config.h.in
-config.log
-config.status
-configure
+*~
+config.*
 file
 nbd-client.8
 nbd-server.1
@@ -16,20 +12,25 @@ stamp-h.in
 stamp-h1
 Doxyfile
 compile
-depcomp
-install-sh
 manpage.refs
 manpage.links
-missing
 mkinstalldirs
 nbd-tester-client
 nbd-client
 nbd-server
-config.guess
-config.sub
-doc
+doc/doxygen-output
 nbd-server.config
+nbd-server.5
+*.o
+nbd-client.8.in
 nbd-server.1.in
 nbd-server.5.in
-nbd-server.5
-nbd.h
+Makefile.in
+config.h.in
+aclocal.m4
+INSTALL
+depcomp
+install-sh
+configure
+man/*.sh
+man/*.sh.in