summaryrefslogtreecommitdiff
path: root/git-octopus-script
Commit message (Expand)AuthorAgeFilesLines
* [PATCH] Infamous 'octopus merge'Junio C Hamano2005-08-241-0/+103