Merge branch 'maint'

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index d99372afc48a96e73da49b1f0787861efaeac1ee..eb8a1f860678ff86f3b9ca95f618226551c884cf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -33,7 +33,6 @@ git-daemon
 git-diff
 git-diff-files
 git-diff-index
-git-diff-stages
 git-diff-tree
 git-describe
 git-fast-import
@@ -101,7 +100,6 @@ git-repo-config
 git-request-pull
 git-rerere
 git-reset
-git-resolve
 git-rev-list
 git-rev-parse
 git-revert
@@ -141,6 +139,7 @@ git-whatchanged
 git-write-tree
 git-core-*/?*
 gitweb/gitweb.cgi
+test-chmtime
 test-date
 test-delta
 test-dump-cache-tree