Merge branch 'master' into sb/opt-filename

diff --git a/.gitignore b/.gitignore
index 1c57d4c958bc5e8ff539c5f5ddb1c784d923271b..41c0b20a76ce0fd47c7cafc51777336ce99ce1b0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ git-apply
 git-archimport
 git-archive
 git-bisect
+git-bisect--helper
 git-blame
 git-branch
 git-bundle
@@ -35,6 +36,8 @@ git-diff
 git-diff-files
 git-diff-index
 git-diff-tree
+git-difftool
+git-difftool--helper
 git-describe
 git-fast-export
 git-fast-import
@@ -78,6 +81,7 @@ git-merge-recursive
 git-merge-resolve
 git-merge-subtree
 git-mergetool
+git-mergetool--lib
 git-mktag
 git-mktree
 git-name-rev