summaryrefslogtreecommitdiff
path: root/git-merge-stupid.sh
Commit message (Collapse)AuthorAgeFilesLines
* Fixing comment in merge strategiesTom Clarke2007-08-301-1/+1
| | | | | | | | 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-021-5/+5
| | | | | | 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-101-0/+80
And rename the one Linus kept calling stupid, 'stupid'. Signed-off-by: Junio C Hamano <junkio@cox.net>