aboutsummaryrefslogtreecommitdiff
path: root/git-merge-stupid.sh
Commit message (Collapse)AuthorAge
* Retire 'stupid' merge strategyMiklos Vajna2008-07-05
| | | | | | | | | | | 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>
* Fixing comment in merge strategiesTom Clarke2007-08-30
| | | | | | | | Comments in both these strategies refer to the wrong number of remotes Signed-off-by: Tom Clarke <tom@u2i.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-02
| | | | | | This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Use Daniel's read-tree in the merge strategy 'resolve'.Junio C Hamano2005-09-10
And rename the one Linus kept calling stupid, 'stupid'. Signed-off-by: Junio C Hamano <junkio@cox.net>