X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=.gitignore;h=31c03f468bedafefe4c8d6dde1bc80e733cb4b62;hb=ccfd3e99621f489db4ea37a03be7674adbd03f6e;hp=be9ea5fa9c1a2476744c5d9a0b1f4c919f4f485d;hpb=720d150c48fc35fca13c6dfb3c76d60e4ee83b87;p=git.git

diff --git a/.gitignore b/.gitignore
index be9ea5fa..31c03f46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@ git-fetch-pack
 git-format-patch
 git-fsck-objects
 git-get-tar-commit-id
+git-grep
 git-hash-object
 git-http-fetch
 git-init-db
@@ -43,10 +44,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