Age | Commit message (Expand) | Author |
---|---|---|
2010-10-02 | merge-octopus: Work around environment issue on Windows | Johannes Schindelin |
2009-12-14 | octopus: remove dead code | Stephen Boyd |
2009-12-14 | octopus: reenable fast-forward merges | Stephen Boyd |
2009-12-14 | octopus: make merge process simpler to follow | Stephen Boyd |
2008-07-30 | git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge | Junio C Hamano |
2007-07-03 | Rewrite "git-frotz" to "git frotz" | Junio C Hamano |
2006-02-07 | read-tree --aggressive | Junio C Hamano |
2006-01-15 | octopus: allow manual resolve on the last round. | Junio C Hamano |
2006-01-13 | octopus: allow criss-cross and clarify the message when it rejects | Junio C Hamano |
2005-11-29 | define die() for scripts that use it. | Junio C Hamano |
2005-11-11 | octopus: do not do AND'ed merge base. | Junio C Hamano |
2005-09-11 | Multi-backend merge driver. | Junio C Hamano |