Merge branch 'nh/http' into next

diff --git a/.gitignore b/.gitignore
index cdb2d53318148dbfde43cbcf218abcbb5cf5a434..afd0876218686c14834ff27b3ad6f0da307da601 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
@@ -115,6 +116,7 @@ git-update-index
 git-update-ref
 git-update-server-info
 git-upload-pack
+git-upload-tar
 git-var
 git-verify-pack
 git-verify-tag
@@ -124,7 +126,6 @@ git-core-*/?*
 test-date
 test-delta
 test-dump-cache-tree
-test-gsimm
 common-cmds.h
 *.tar.gz
 *.dsc