Merge branch 'master' into sp/fast-import

diff --git a/.gitignore b/.gitignore
index 6da1cdbd0de72dc1bff64414e901484474d22a36..a9dc462cb524c6eda5bc8d081c7d8d04156593b8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@ git-diff-index
 git-diff-stages
 git-diff-tree
 git-describe
+git-fast-import
 git-fetch
 git-fetch-pack
 git-findtags