Use git-merge instead of git-resolve in git-pull.
[gitweb.git] / git-pull.sh
2005-09-21 Use git-merge instead of git-resolve in git-pull.
2005-09-18 Merge branch 'master' of .
2005-09-16 Revert breakage introduced by c80522e30fdc190f8c8c7fc98...
2005-09-14 Make merge comment git-pull makes for an octopus a...
2005-09-08 Big tool rename.