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