Commit message (Expand) | Author | Age | |
---|---|---|---|
* | diff --stat: use less columns for change counts | Zbigniew Jędrzejewski-Szmek | 2012-04-30 |
* | Merge branch 'jc/merge-reduce-parents-early' | Junio C Hamano | 2012-04-27 |
|\ | |||
| * | builtin/merge.c: reduce parents early | Junio C Hamano | 2012-04-17 |
| * | merge tests: octopus with redundant parents | Michał Kiedrowicz | 2012-04-17 |
* | | test: use test_i18ncmp when checking --stat output | Jonathan Nieder | 2012-03-13 |
|/ | |||
* | Use correct grammar in diffstat summary line | Nguyễn Thái Ngọc Duy | 2012-02-03 |
* | merge: reword the final message | Junio C Hamano | 2011-05-25 |
* | 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 |