Use git-merge instead of git-resolve in git-pull.
[git.git] / git-pull.sh
2005-09-21 Junio C HamanoUse git-merge instead of git-resolve in git-pull.
2005-09-18 Junio C HamanoMerge branch 'master' of .
2005-09-16 Junio C HamanoRevert breakage introduced by c80522e30fdc190f8c8c7fc98...
2005-09-14 Junio C HamanoMake merge comment git-pull makes for an octopus a...
2005-09-08 Junio C HamanoBig tool rename.