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