difftool: move 'git-difftool' out of contrib

diff --git a/.gitignore b/.gitignore
index 13311f1d5e32db381cc555a97e6eb405e63d5aba..a36da9d981e4153b0cd20d0737f958b3da1f4efc 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,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
@@ -82,7 +84,6 @@ git-mktag
 git-mktree
 git-name-rev
 git-mv
-git-notes
 git-pack-redundant
 git-pack-objects
 git-pack-refs