summaryrefslogtreecommitdiff
path: root/git-resolve-script
Commit message (Expand)AuthorAgeFilesLines
* Fix git-resolve-script.Linus Torvalds2005-05-051-1/+1
* Split "git-pull-script" into two partsLinus Torvalds2005-05-051-0/+56