summaryrefslogtreecommitdiff
path: root/git-pull.sh
Commit message (Expand)AuthorAgeFilesLines
...
* Use git-merge instead of git-resolve in git-pull.Junio C Hamano2005-09-201-7/+33
* Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93.Junio C Hamano2005-09-151-1/+1
* Make merge comment git-pull makes for an octopus a bit prettier.Junio C Hamano2005-09-131-3/+5
* Big tool rename.Junio C Hamano2005-09-071-0/+44