Merge branch 'jc/upload-pack-hook'

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 16f7a97d9711acd9f9bd2397eccde191f00b3254..10808e3a734c2fdcee523e49bf1e8a6694002cc1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -36,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
@@ -79,6 +81,7 @@ git-merge-recursive
 git-merge-resolve
 git-merge-subtree
 git-mergetool
+git-mergetool--lib
 git-mktag
 git-mktree
 git-name-rev
@@ -102,6 +105,7 @@ git-reflog
 git-relink
 git-remote
 git-repack
+git-replace
 git-repo-config
 git-request-pull
 git-rerere