Revert "builtin-archive: use RUN_SETUP"

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index b4dccd7b816e958273ec84b77e8ff4d1602461de..e8d2731ee5d7b3ad58bd0bebfe1ae87bed140615 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ git-archive
 git-bisect
 git-blame
 git-branch
+git-bundle
 git-cat-file
 git-check-ref-format
 git-checkout
@@ -33,15 +34,17 @@ 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
 git-for-each-ref
 git-format-patch
+git-fsck
 git-fsck-objects
 git-gc
 git-get-tar-commit-id
@@ -70,10 +73,10 @@ git-merge-tree
 git-merge-octopus
 git-merge-one-file
 git-merge-ours
-git-merge-recur
 git-merge-recursive
 git-merge-resolve
 git-merge-stupid
+git-mergetool
 git-mktag
 git-mktree
 git-name-rev
@@ -100,7 +103,6 @@ git-repo-config
 git-request-pull
 git-rerere
 git-reset
-git-resolve
 git-rev-list
 git-rev-parse
 git-revert
@@ -140,6 +142,7 @@ git-whatchanged
 git-write-tree
 git-core-*/?*
 gitweb/gitweb.cgi
+test-chmtime
 test-date
 test-delta
 test-dump-cache-tree