summaryrefslogtreecommitdiffstats
path: root/git-pull.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* Prettyprint octopus merge message.Junio C Hamano2005-09-231-7/+2
* Revert "Use git-merge instead of git-resolve in git-pull."Junio C Hamano2005-09-211-33/+7
* Revert "Make Octopus merge message a bit nicer."Junio C Hamano2005-09-211-76/+5
* Make Octopus merge message a bit nicer.Junio C Hamano2005-09-211-5/+76
* Use git-merge instead of git-resolve in git-pull.Junio C Hamano2005-09-211-7/+33
* Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93.Junio C Hamano2005-09-161-1/+1
* Make merge comment git-pull makes for an octopus a bit prettier.Junio C Hamano2005-09-141-3/+5
* Big tool rename.Junio C Hamano2005-09-081-0/+44