X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=.gitignore;h=0fd59b9ff26f766432d086c32c228f85e4b78c20;hb=34143b2639625f29edf7b1c0c5af58e545845911;hp=cc2b29ebfca5beb2a962681a045660972257b9da;hpb=2aba319a52b3601cff3f32b60bc28023ee45575d;p=git.git

diff --git a/.gitignore b/.gitignore
index cc2b29eb..0fd59b9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@ git-applypatch
 git-archimport
 git-bisect
 git-branch
-git-build-rev-cache
 git-cat-file
 git-checkout
 git-checkout-index
@@ -44,10 +43,10 @@ git-mailinfo
 git-mailsplit
 git-merge
 git-merge-base
-git-merge-fredrik
 git-merge-index
 git-merge-octopus
 git-merge-one-file
+git-merge-recursive
 git-merge-resolve
 git-merge-stupid
 git-mktag
@@ -73,13 +72,15 @@ git-rev-list
 git-rev-parse
 git-rev-tree
 git-revert
+git-send-email
 git-send-pack
 git-sh-setup
 git-shortlog
 git-show-branch
 git-show-index
-git-show-rev-cache
 git-ssh-fetch
+git-ssh-pull
+git-ssh-push
 git-ssh-upload
 git-status
 git-stripspace