summaryrefslogtreecommitdiff
path: root/git-pull.sh
AgeCommit message (Expand)Author
2006-02-12Avoid using "git-var -l" until it gets fixed.Junio C Hamano
2005-12-14Trivial usage string clean-upfreku045@student.liu.se
2005-11-25git-sh-setup: die if outside git repository.Junio C Hamano
2005-11-10Make git-recursive the default strategy for git-pull.Junio C Hamano
2005-11-07Recover dropped +x bit from git-pull.sh by accident.Junio C Hamano
2005-11-07Refactored merge options into separate merge-options.txt.Jon Loeliger
2005-11-05Document the --no-commit flag betterJunio C Hamano
2005-11-03Add --no-commit to git-merge/git-pull.Junio C Hamano
2005-10-03git-pull: do not barf on -a flag meant for git-fetch.Junio C Hamano
2005-09-29Use git-merge in git-pull (second try).Junio C Hamano
2005-09-28Use git-update-ref in scripts.Junio C Hamano
2005-09-28Fix default pull not to do an unintended Octopus.Junio C Hamano
2005-09-23Prettyprint octopus merge message.Junio C Hamano
2005-09-21Revert "Use git-merge instead of git-resolve in git-pull."Junio C Hamano
2005-09-21Revert "Make Octopus merge message a bit nicer."Junio C Hamano
2005-09-21Make Octopus merge message a bit nicer.Junio C Hamano
2005-09-21Use git-merge instead of git-resolve in git-pull.Junio C Hamano
2005-09-16Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93.Junio C Hamano
2005-09-14Make merge comment git-pull makes for an octopus a bit prettier.Junio C Hamano
2005-09-08Big tool rename.Junio C Hamano