Merge branch 'master' into sp/fast-import

diff --git a/.gitignore b/.gitignore
index 2904f123496ddf8f69473675c183999d07838170..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
@@ -50,6 +51,7 @@ git-http-fetch
 git-http-push
 git-imap-send
 git-index-pack
+git-init
 git-init-db
 git-instaweb
 git-local-fetch
@@ -92,6 +94,7 @@ git-rebase
 git-receive-pack
 git-reflog
 git-relink
+git-remote
 git-repack
 git-repo-config
 git-request-pull