summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
Commit message (Expand)AuthorAgeFilesLines
* git-merge-octopus: do not capitalize "octopus"Alex Henrie2016-09-081-2/+2
* i18n: git-sh-setup.sh: mark strings for translationVasco Almeida2016-06-171-1/+0
* merge-octopus: use die shell function from git-sh-setup.shVasco Almeida2016-06-171-5/+1
* i18n: merge-octopus: mark messages for translationVasco Almeida2016-06-171-8/+10
* merge-octopus: abort if index does not match HEADen/merge-octopus-fixElijah Newren2016-04-121-0/+6
* merge-octopus: Work around environment issue on WindowsJohannes Schindelin2010-10-011-0/+5
* octopus: remove dead codeStephen Boyd2009-12-131-5/+1
* octopus: reenable fast-forward mergesStephen Boyd2009-12-131-1/+1
* octopus: make merge process simpler to followStephen Boyd2009-12-131-4/+5
* git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise mergeJunio C Hamano2008-07-301-9/+2
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-021-7/+7
* read-tree --aggressiveJunio C Hamano2006-02-061-1/+1
* octopus: allow manual resolve on the last round.Junio C Hamano2006-01-141-6/+14
* octopus: allow criss-cross and clarify the message when it rejectsJunio C Hamano2006-01-131-7/+7
* define die() for scripts that use it.Junio C Hamano2005-11-281-0/+5
* octopus: do not do AND'ed merge base.Junio C Hamano2005-11-111-5/+20
* Multi-backend merge driver.Junio C Hamano2005-09-101-0/+86
View Lorry Controller Status