path: root/
AgeCommit message (Expand)Author
2017-09-10Merge branch 'ma/up-to-date'Junio C Hamano
2017-08-23treewide: correct several "up-to-date" to "up to date"Martin Ă…gren
2017-08-07scripts: use "git foo" not "git-foo"Michael Forney
2016-09-08git-merge-octopus: do not capitalize "octopus"Alex Henrie
2016-06-17i18n: mark strings for translationVasco Almeida
2016-06-17merge-octopus: use die shell function from git-sh-setup.shVasco Almeida
2016-06-17i18n: merge-octopus: mark messages for translationVasco Almeida
2016-04-13merge-octopus: abort if index does not match HEADElijah Newren
2010-10-01merge-octopus: Work around environment issue on WindowsJohannes Schindelin
2009-12-14octopus: remove dead codeStephen Boyd
2009-12-14octopus: reenable fast-forward mergesStephen Boyd
2009-12-14octopus: make merge process simpler to followStephen Boyd
2008-07-30git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise mergeJunio C Hamano
2007-07-03Rewrite "git-frotz" to "git frotz"Junio C Hamano
2006-02-07read-tree --aggressiveJunio C Hamano
2006-01-15octopus: allow manual resolve on the last round.Junio C Hamano
2006-01-13octopus: allow criss-cross and clarify the message when it rejectsJunio C Hamano
2005-11-29define die() for scripts that use it.Junio C Hamano
2005-11-11octopus: do not do AND'ed merge base.Junio C Hamano
2005-09-11Multi-backend merge driver.Junio C Hamano