Skip to content
Browse files

Sort .gitignore to reduce chance for merge conflict

Change-Id: I93b8f165311a6839933c64f58089f8936de8fe33
  • Loading branch information...
1 parent 4a7a1ed commit 499a691d47080f4deb1c5d1bcab7666aa47c352b @trondn trondn committed Aug 3, 2010
Showing with 40 additions and 39 deletions.
  1. +40 −39 .gitignore
View
79 .gitignore
@@ -1,71 +1,72 @@
+# Keep the entries sorted to reduce the chance for merge conflict!
*.[ao]
*.exe
-*.gcov
*.gcda
*.gcno
+*.gcov
*.tcov
+*~
+.buildbot/*
.deps
/GPATH
/GRTAGS
/GSYMS
/GTAGS
/ID
+/check_moxi
+/check_moxi_agent
+/check_util
+/check_work
+/debian/changelog
+/doc/doxy
+/m4/libtool.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/m4/lt~obsolete.m4
+/m4/version.m4
+/memcached.spec
+/scripts/rpm/moxi.spec
+/sizes
+/t/check_moxi_agent.cfg
+/testapp
+/timedrun
+/version.num
INSTALL
Makefile
Makefile.in
-/debian/changelog
-/scripts/rpm/moxi.spec
+TAGS
+aclocal.m4
+autom4te.cache
+compile
config.guess
config.h
config.h.in
config.log
config.status
config.sub
-aclocal.m4
-compile
-autom4te.cache
configure
+cscope.out
depcomp
+doc/protocol-binary-range.txt
+doc/protocol-binary.txt
install-sh
+libmemcached-*/libmemcached/*.la
+libmemcached-*/libmemcached/*.lo
+libmemcached-*/libmemcached/.libs/
+libmemcached-*/libmemcached/libmemcached_config.h
+libtool
+ltmain.sh
memcached
+memcached-*.tar.gz
memcached-debug
memcached-debug.profile
+memcached_dtrace.h
+missing
moxi
+moxi-*.tar.gz
moxi-debug
moxi-debug.profile
-missing
stamp-h1
stamp-h2
tags
-TAGS
-cscope.out
-memcached_dtrace.h
-*~
-memcached-*.tar.gz
-moxi-*.tar.gz
-doc/protocol-binary-range.txt
-doc/protocol-binary.txt
-/sizes
-/m4/version.m4
-/version.num
-/testapp
-/timedrun
-/doc/doxy
-/check_util
-/check_moxi
-/check_moxi_agent
-/check_work
-ltmain.sh
-libtool
-libmemcached-*/libmemcached/.libs/
-libmemcached-*/libmemcached/*.lo
-libmemcached-*/libmemcached/*.la
-libmemcached-*/libmemcached/libmemcached_config.h
-.buildbot/*
-/t/check_moxi_agent.cfg
-/memcached.spec
-/m4/libtool.m4
-/m4/ltoptions.m4
-/m4/ltsugar.m4
-/m4/ltversion.m4
-/m4/lt~obsolete.m4

0 comments on commit 499a691

Please sign in to comment.
Something went wrong with that request. Please try again.