summaryrefslogtreecommitdiff
path: root/git-pull.sh
Commit message (Expand)AuthorAgeFilesLines
* pull --rebase: be cleverer with rebased upstream branchesJohannes Schindelin2008-01-261-1/+11
* "git pull --tags": error out with a better message.Junio C Hamano2007-12-281-26/+40
* Teach 'git pull' about --rebaseJohannes Schindelin2007-11-281-1/+10
* scripts: Add placeholders for OPTIONS_SPECJunio C Hamano2007-11-061-0/+1
* Teach git-pull about --[no-]ff, --no-squash and --commitLars Hjemli2007-10-291-3/+11
* Make git-pull complain and give advice when there is nothing to merge withFederico Mena Quintero2007-10-021-4/+18
* Supplant the "while case ... break ;; esac" idiomDavid Kastrup2007-09-231-3/+3
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-021-8/+8
* Add a configuration option to control diffstat after mergeAlex Riesen2007-05-241-0/+3
* git-pull: disallow implicit merging to detached HEADJeff King2007-01-151-2/+11
* Allow whole-tree operations to be started from a subdirectoryJunio C Hamano2007-01-121-1/+3
* Disallow working directory commands in a bare repository.Shawn O. Pearce2007-01-101-0/+1
* fail pull/merge early in the middle of conflicted mergeJunio C Hamano2007-01-011-0/+3
* Allow git-merge to select the default strategy.Shawn O. Pearce2006-12-281-18/+0
* Ensure `git-pull` fails if `git-merge` fails.Shawn O. Pearce2006-12-281-1/+1
* Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce2006-12-281-3/+3
* Move "no merge candidate" warning into git-pullJosef Weidendorfer2006-12-191-0/+4
* git-pull: allow pulling into an empty repositoryLinus Torvalds2006-11-161-2/+14
* git-pull: we say commit X, not X commit.Junio C Hamano2006-10-101-1/+1
* Log ref changes made by git-merge and git-pull.Shawn Pearce2006-07-111-1/+2
* Log ref changes made by git-fetch and git-pull.Shawn Pearce2006-07-101-1/+1
* Fix expr usage for FreeBSDDennis Stosberg2006-06-271-1/+1
* git-merge --squashJunio C Hamano2006-06-241-2/+5
* git-pull: abort when fmt-merge-msg fails.Junio C Hamano2006-06-241-1/+1
* git-pull: reword "impossible to fast-forward" message.Junio C Hamano2006-03-221-1/+7
* git-pull: further safety while on tracking branch.Junio C Hamano2006-03-221-1/+3
* git-pull: run repo-config with dash form.Junio C Hamano2006-03-181-2/+2
* Let merge set the default strategy.Mark Hollomon2006-03-151-7/+3
* Avoid using "git-var -l" until it gets fixed.Junio C Hamano2006-02-121-4/+4
* Trivial usage string clean-upfreku045@student.liu.se2005-12-141-11/+2
* git-sh-setup: die if outside git repository.Junio C Hamano2005-11-251-1/+1
* Make git-recursive the default strategy for git-pull.Junio C Hamano2005-11-091-2/+14
* Recover dropped +x bit from git-pull.sh by accident.Junio C Hamano2005-11-071-0/+0
* Refactored merge options into separate merge-options.txt.Jon Loeliger2005-11-061-1/+11
* Document the --no-commit flag betterJunio C Hamano2005-11-041-1/+1
* Add --no-commit to git-merge/git-pull.Junio C Hamano2005-11-031-2/+4
* git-pull: do not barf on -a flag meant for git-fetch.Junio C Hamano2005-10-031-1/+2
* Use git-merge in git-pull (second try).Junio C Hamano2005-09-291-4/+44
* Use git-update-ref in scripts.Junio C Hamano2005-09-281-3/+3
* Fix default pull not to do an unintended Octopus.Junio C Hamano2005-09-281-1/+3
* Prettyprint octopus merge message.Junio C Hamano2005-09-221-7/+2
* Revert "Use git-merge instead of git-resolve in git-pull."Junio C Hamano2005-09-211-33/+7
* Revert "Make Octopus merge message a bit nicer."Junio C Hamano2005-09-211-76/+5
* Make Octopus merge message a bit nicer.Junio C Hamano2005-09-201-5/+76
* Use git-merge instead of git-resolve in git-pull.Junio C Hamano2005-09-201-7/+33
* Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93.Junio C Hamano2005-09-151-1/+1
* Make merge comment git-pull makes for an octopus a bit prettier.Junio C Hamano2005-09-131-3/+5
* Big tool rename.Junio C Hamano2005-09-071-0/+44
View Lorry Controller Status