aboutsummaryrefslogtreecommitdiff
path: root/git-pull.sh
Commit message (Expand)AuthorAge
* Recover dropped +x bit from git-pull.sh by accident.Junio C Hamano2005-11-07
* Refactored merge options into separate merge-options.txt.Jon Loeliger2005-11-06
* Document the --no-commit flag betterJunio C Hamano2005-11-04
* Add --no-commit to git-merge/git-pull.Junio C Hamano2005-11-03
* git-pull: do not barf on -a flag meant for git-fetch.Junio C Hamano2005-10-03
* Use git-merge in git-pull (second try).Junio C Hamano2005-09-29
* Use git-update-ref in scripts.Junio C Hamano2005-09-28
* Fix default pull not to do an unintended Octopus.Junio C Hamano2005-09-28
* Prettyprint octopus merge message.Junio C Hamano2005-09-22
* Revert "Use git-merge instead of git-resolve in git-pull."Junio C Hamano2005-09-21
* Revert "Make Octopus merge message a bit nicer."Junio C Hamano2005-09-21
* Make Octopus merge message a bit nicer.Junio C Hamano2005-09-20
* Use git-merge instead of git-resolve in git-pull.Junio C Hamano2005-09-20
* Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93.Junio C Hamano2005-09-15
* Make merge comment git-pull makes for an octopus a bit prettier.Junio C Hamano2005-09-13
* Big tool rename.Junio C Hamano2005-09-07