Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2015-03-20 | t: fix moderate &&-chain breakage | Jeff King | 1 | -1/+1 |
2012-04-17 | builtin/merge.c: reduce parents early | Junio C Hamano | 1 | -1/+1 |
2012-04-17 | merge tests: octopus with redundant parents | MichaĆ Kiedrowicz | 1 | -1/+16 |
2009-10-24 | Use 'fast-forward' all over the place | Felipe Contreras | 1 | -1/+1 |
2007-08-27 | git-merge: do up-to-date check also for all strategies | Junio C Hamano | 1 | -0/+77 |