summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
AgeCommit message (Expand)AuthorFilesLines
2016-04-12merge-octopus: abort if index does not match HEADLibravatar Elijah Newren1-0/+6
2010-10-01merge-octopus: Work around environment issue on WindowsLibravatar Johannes Schindelin1-0/+5
2009-12-13octopus: remove dead codeLibravatar Stephen Boyd1-5/+1
2009-12-13octopus: reenable fast-forward mergesLibravatar Stephen Boyd1-1/+1
2009-12-13octopus: make merge process simpler to followLibravatar Stephen Boyd1-4/+5
2008-07-30git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise mergeLibravatar Junio C Hamano1-9/+2
2007-07-02Rewrite "git-frotz" to "git frotz"Libravatar Junio C Hamano1-7/+7
2006-02-06read-tree --aggressiveLibravatar Junio C Hamano1-1/+1
2006-01-14octopus: allow manual resolve on the last round.Libravatar Junio C Hamano1-6/+14
2006-01-13octopus: allow criss-cross and clarify the message when it rejectsLibravatar Junio C Hamano1-7/+7
2005-11-28define die() for scripts that use it.Libravatar Junio C Hamano1-0/+5
2005-11-11octopus: do not do AND'ed merge base.Libravatar Junio C Hamano1-5/+20
2005-09-10Multi-backend merge driver.Libravatar Junio C Hamano1-0/+86