summaryrefslogtreecommitdiff
path: root/git-octopus-script
AgeCommit message (Expand)Author
2005-08-24[PATCH] Infamous 'octopus merge'Junio C Hamano