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