| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | Use 'fast-forward' all over the place | Felipe Contreras | 2009-10-24 |
| * | git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge | Junio C Hamano | 2008-07-30 |
| * | Rewrite "git-frotz" to "git frotz" | Junio C Hamano | 2007-07-02 |
| * | read-tree --aggressive | Junio C Hamano | 2006-02-06 |
| * | octopus: allow manual resolve on the last round. | Junio C Hamano | 2006-01-14 |
| * | octopus: allow criss-cross and clarify the message when it rejects | Junio C Hamano | 2006-01-13 |
| * | define die() for scripts that use it. | Junio C Hamano | 2005-11-28 |
| * | octopus: do not do AND'ed merge base. | Junio C Hamano | 2005-11-11 |
| * | Multi-backend merge driver. | Junio C Hamano | 2005-09-10 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |
path: root/git-merge-octopus.sh