[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index f42b7e8..31c03f4 100644 (file)
--- 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
@@ -46,6 +47,7 @@ git-merge-base
 git-merge-index
 git-merge-octopus
 git-merge-one-file
+git-merge-recursive
 git-merge-resolve
 git-merge-stupid
 git-mktag