X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=.gitignore;h=f15155d1b7bcb45db6a8d67eab51b535102353c1;hb=0425ea90889f967c3966ace3e5a85b9a5a44c358;hp=a43444fb92e3475eaadbc7792e0defb9153910fb;hpb=9299c4f147bcff603eef187eb04fe38153571d30;p=git.git

diff --git a/.gitignore b/.gitignore
index a43444fb9..f15155d1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,9 +33,9 @@ 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-pack
 git-findtags
@@ -71,7 +71,6 @@ 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
@@ -101,7 +100,6 @@ git-repo-config
 git-request-pull
 git-rerere
 git-reset
-git-resolve
 git-rev-list
 git-rev-parse
 git-revert