projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'da/difftool'
[git.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index 16f7a97d9711acd9f9bd2397eccde191f00b3254..41c0b20a76ce0fd47c7cafc51777336ce99ce1b0 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