Merge branch 'lt/tree' into jc/lt-tree-n-cache-tree

diff --git a/.gitignore b/.gitignore
index 7906909b306f80ed74d6e53bb8514a889057194c..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