| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2007-08-31 | Fixing comment in merge strategies | Tom Clarke | |
| 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> | |||
| 2007-07-03 | Rewrite "git-frotz" to "git frotz" | Junio C Hamano | |
| This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano <gitster@pobox.com> | |||
| 2005-09-11 | Use Daniel's read-tree in the merge strategy 'resolve'. | Junio C Hamano | |
| And rename the one Linus kept calling stupid, 'stupid'. Signed-off-by: Junio C Hamano <junkio@cox.net> | |||
 |
index : git | |
| Git: sistema de control de versiones | mirror |
| summaryrefslogtreecommitdiff |
path: root/git-merge-stupid.sh