Commit message (Expand) | Author | Age | |
---|---|---|---|
* | tests: add missing && | Jonathan Nieder | 2010-11-09 |
* | octopus: reenable fast-forward merges | Stephen Boyd | 2009-12-13 |
* | octopus: make merge process simpler to follow | Stephen Boyd | 2009-12-13 |
* | tests: use "git xyzzy" form (t7200 - t9001) | Nanako Shiraishi | 2008-09-03 |
* | Build in merge | Miklos Vajna | 2008-07-07 |
* | Add new test to ensure git-merge handles more than 25 refs. | Miklos Vajna | 2008-06-30 |