Merge branch 'jc/fmt-patch'

diff --git a/.gitignore b/.gitignore
index b5959d63116aa1e3e900f43a137295b47376e1e0..199cc310a25281a1b423be9399fb9633f0d0c066 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -77,6 +77,7 @@ git-prune
 git-prune-packed
 git-pull
 git-push
+git-quiltimport
 git-read-tree
 git-rebase
 git-receive-pack