Merge branch 'gfi-maint' into maint

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index eb8a1f860678ff86f3b9ca95f618226551c884cf..e8d2731ee5d7b3ad58bd0bebfe1ae87bed140615 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ git-archive
 git-bisect
 git-blame
 git-branch
+git-bundle
 git-cat-file
 git-check-ref-format
 git-checkout
@@ -37,6 +38,7 @@ git-diff-tree
 git-describe
 git-fast-import
 git-fetch
+git-fetch--tool
 git-fetch-pack
 git-findtags
 git-fmt-merge-msg
@@ -74,6 +76,7 @@ git-merge-ours
 git-merge-recursive
 git-merge-resolve
 git-merge-stupid
+git-mergetool
 git-mktag
 git-mktree
 git-name-rev