| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge-octopus: Work around environment issue on Windows | Johannes Schindelin | 2010-10-01 | 1 | -0/+5 |
| * | octopus: remove dead code | Stephen Boyd | 2009-12-13 | 1 | -5/+1 |
| * | octopus: reenable fast-forward merges | Stephen Boyd | 2009-12-13 | 1 | -1/+1 |
| * | octopus: make merge process simpler to follow | Stephen Boyd | 2009-12-13 | 1 | -4/+5 |
| * | git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge | Junio C Hamano | 2008-07-30 | 1 | -9/+2 |
| * | Rewrite "git-frotz" to "git frotz" | Junio C Hamano | 2007-07-02 | 1 | -7/+7 |
| * | read-tree --aggressive | Junio C Hamano | 2006-02-06 | 1 | -1/+1 |
| * | octopus: allow manual resolve on the last round. | Junio C Hamano | 2006-01-14 | 1 | -6/+14 |
| * | octopus: allow criss-cross and clarify the message when it rejects | Junio C Hamano | 2006-01-13 | 1 | -7/+7 |
| * | define die() for scripts that use it. | Junio C Hamano | 2005-11-28 | 1 | -0/+5 |
| * | octopus: do not do AND'ed merge base. | Junio C Hamano | 2005-11-11 | 1 | -5/+20 |
| * | Multi-backend merge driver. | Junio C Hamano | 2005-09-10 | 1 | -0/+86 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |
path: root/git-merge-octopus.sh