summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
Commit message (Expand)AuthorAgeFilesLines
* 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