Age | Commit message (Expand) | Author |
---|---|---|
2011-05-26 | merge: reword the final message | Junio C Hamano |
2010-11-09 | tests: add missing && | Jonathan Nieder |
2009-12-14 | octopus: reenable fast-forward merges | Stephen Boyd |
2009-12-14 | octopus: make merge process simpler to follow | Stephen Boyd |
2008-09-04 | tests: use "git xyzzy" form (t7200 - t9001) | Nanako Shiraishi |
2008-07-08 | Build in merge | Miklos Vajna |
2008-07-01 | Add new test to ensure git-merge handles more than 25 refs. | Miklos Vajna |