summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2008-07-05 14:43:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-05 17:43:46 (GMT)
commit51add76e92c9de9bcad3d421303b45ab488d529e (patch)
tree96d2774de499bf213ea1f1d6e33ffcf1ce4cac1e /.gitignore
parent6cf91492d9cd985e1fa65181d99d6d578d4439dc (diff)
downloadgit-51add76e92c9de9bcad3d421303b45ab488d529e.zip
git-51add76e92c9de9bcad3d421303b45ab488d529e.tar.gz
git-51add76e92c9de9bcad3d421303b45ab488d529e.tar.bz2
Retire 'stupid' merge strategy
As pointed out by Linus, this strategy tries to take the best merge base, but 'recursive' just does it better. If one needs something more than 'resolve' then he/she should really use 'recursive' and not 'stupid'. Cf. Message-ID: <alpine.LFD.1.10.0807030947360.18105@woody.linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 4ff2fec..8054d9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,7 +75,6 @@ git-merge-one-file
git-merge-ours
git-merge-recursive
git-merge-resolve
-git-merge-stupid
git-merge-subtree
git-mergetool
git-mktag