Age | Commit message (Expand) | Author |
---|---|---|
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 |