GIT 1.5.1-rc3

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9c912c11c148134ff6bbc55df718af1f8d0c1af6..e8d2731ee5d7b3ad58bd0bebfe1ae87bed140615 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -34,11 +34,11 @@ git-daemon
 git-diff
 git-diff-files
 git-diff-index
-git-diff-stages
 git-diff-tree
 git-describe
 git-fast-import
 git-fetch
+git-fetch--tool
 git-fetch-pack
 git-findtags
 git-fmt-merge-msg
@@ -76,6 +76,7 @@ git-merge-ours
 git-merge-recursive
 git-merge-resolve
 git-merge-stupid
+git-mergetool
 git-mktag
 git-mktree
 git-name-rev
@@ -102,7 +103,6 @@ git-repo-config
 git-request-pull
 git-rerere
 git-reset
-git-resolve
 git-rev-list
 git-rev-parse
 git-revert
@@ -142,6 +142,7 @@ git-whatchanged
 git-write-tree
 git-core-*/?*
 gitweb/gitweb.cgi
+test-chmtime
 test-date
 test-delta
 test-dump-cache-tree