summaryrefslogtreecommitdiff
path: root/git-pull.sh
AgeCommit message (Expand)AuthorFilesLines
2005-09-28Use git-update-ref in scripts.Libravatar Junio C Hamano1-3/+3
2005-09-28Fix default pull not to do an unintended Octopus.Libravatar Junio C Hamano1-1/+3
2005-09-22Prettyprint octopus merge message.Libravatar Junio C Hamano1-7/+2
2005-09-21Revert "Use git-merge instead of git-resolve in git-pull."Libravatar Junio C Hamano1-33/+7
2005-09-21Revert "Make Octopus merge message a bit nicer."Libravatar Junio C Hamano1-76/+5
2005-09-20Make Octopus merge message a bit nicer.Libravatar Junio C Hamano1-5/+76
2005-09-20Use git-merge instead of git-resolve in git-pull.Libravatar Junio C Hamano1-7/+33
2005-09-15Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93.Libravatar Junio C Hamano1-1/+1
2005-09-13Make merge comment git-pull makes for an octopus a bit prettier.Libravatar Junio C Hamano1-3/+5
2005-09-07Big tool rename.Libravatar Junio C Hamano1-0/+44