Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'master' of git://repo.or.cz/git/mergetool
[gitweb.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index 0eaba0a278df33fbef7f247ce267181d7ccba5f0..27797d1491938a9ca6b1f6dbd52d20e3388b0bed 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-75,6
+75,7
@@
git-merge-ours
git-merge-recursive
git-merge-resolve
git-merge-stupid
+git-mergetool
git-mktag
git-mktree
git-name-rev