Be more backward compatible with git-ssh-{push,pull}.

diff --git a/.gitignore b/.gitignore
index cc2b29ebfca5beb2a962681a045660972257b9da..1d4a41159352935f39ed7c8442202e60f296ecd5 100644 (file)
--- 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
@@ -78,8 +77,9 @@ 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