Merge branch 'jc/fmt-patch'

diff --git a/.gitignore b/.gitignore
index b4355b9faf598ff23243954b6b1aaa5cc3a6e832..199cc310a25281a1b423be9399fb9633f0d0c066 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ git-checkout
 git-checkout-index
 git-cherry
 git-cherry-pick
+git-clean
 git-clone
 git-clone-pack
 git-commit
@@ -76,6 +77,7 @@ git-prune
 git-prune-packed
 git-pull
 git-push
+git-quiltimport
 git-read-tree
 git-rebase
 git-receive-pack
@@ -128,8 +130,7 @@ common-cmds.h
 *.deb
 git-core.spec
 *.exe
-libgit.a
-*.o
+*.[ao]
 *.py[co]
 config.mak
 git-blame