aboutsummaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
Commit message (Expand)AuthorAge
* i18n: git-sh-setup.sh: mark strings for translationVasco Almeida2016-06-17
* merge-octopus: use die shell function from git-sh-setup.shVasco Almeida2016-06-17
* i18n: merge-octopus: mark messages for translationVasco Almeida2016-06-17
* merge-octopus: abort if index does not match HEADElijah Newren2016-04-12
* merge-octopus: Work around environment issue on WindowsJohannes Schindelin2010-10-01
* octopus: remove dead codeStephen Boyd2009-12-13
* octopus: reenable fast-forward mergesStephen Boyd2009-12-13
* octopus: make merge process simpler to followStephen Boyd2009-12-13
* git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise mergeJunio C Hamano2008-07-30
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-02
* read-tree --aggressiveJunio C Hamano2006-02-06
* octopus: allow manual resolve on the last round.Junio C Hamano2006-01-14
* octopus: allow criss-cross and clarify the message when it rejectsJunio C Hamano2006-01-13
* define die() for scripts that use it.Junio C Hamano2005-11-28
* octopus: do not do AND'ed merge base.Junio C Hamano2005-11-11
* Multi-backend merge driver.Junio C Hamano2005-09-10
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-27 06:55:01 +0000