summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorFredrik Kuivinen <freku045@student.liu.se>2005-09-13 08:22:26 +0200
committerJunio C Hamano <junkio@cox.net>2005-09-13 00:20:54 -0700
commite4cf17ce0db2dab7c9525a732f86c5e3df3b4ed0 (patch)
treee311046e26ff830a2232067e6ad00ba06db95e2d /.gitignore
parentf88ed172e7a391bd907798ad2a3347a83cd24317 (diff)
downloadgit-e4cf17ce0db2dab7c9525a732f86c5e3df3b4ed0.tar.gz
[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
Otherwise we would regret when Fredrik comes up with another merge algorithm with different pros-and-cons with the current one. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index cc2b29ebfc..31c03f468b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,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