path: root/
AgeCommit message (Expand)Author
2008-11-19Retain multiple -q/-v occurrences in git pullTuncer Ayaz
2008-11-15Teach/Fix pull/fetch -q/-v optionsTuncer Ayaz
2008-10-17pull: allow "git pull origin $something:$current_branch" into an unborn branchJunio C Hamano
2008-07-23Ignore dirty submodule states in "git pull --rebase"Johannes Schindelin
2008-07-13Make usage strings dash-lessStephan Beyer
2008-05-23pull --rebase: exit early when the working directory is dirtyJohannes Schindelin
2008-04-13merge, pull: add '--(no-)log' command line optionSZEDER Gábor
2008-04-13merge, pull: introduce '--(no-)stat' optionSZEDER Gábor
2008-02-23pull: pass --strategy along to to rebaseJay Soffian
2008-01-27pull --rebase: be cleverer with rebased upstream branchesJohannes Schindelin
2007-12-29"git pull --tags": error out with a better message.Junio C Hamano
2007-11-29Teach 'git pull' about --rebaseJohannes Schindelin
2007-11-06scripts: Add placeholders for OPTIONS_SPECJunio C Hamano
2007-10-29Teach git-pull about --[no-]ff, --no-squash and --commitLars Hjemli
2007-10-03Make git-pull complain and give advice when there is nothing to merge withFederico Mena Quintero
2007-09-23Supplant the "while case ... break ;; esac" idiomDavid Kastrup
2007-07-03Rewrite "git-frotz" to "git frotz"Junio C Hamano
2007-05-25Add a configuration option to control diffstat after mergeAlex Riesen
2007-01-15git-pull: disallow implicit merging to detached HEADJeff King
2007-01-13Allow whole-tree operations to be started from a subdirectoryJunio C Hamano
2007-01-10Disallow working directory commands in a bare repository.Shawn O. Pearce
2007-01-01fail pull/merge early in the middle of conflicted mergeJunio C Hamano
2006-12-28Allow git-merge to select the default strategy.Shawn O. Pearce
2006-12-28Ensure `git-pull` fails if `git-merge` fails.Shawn O. Pearce
2006-12-28Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce
2006-12-19Move "no merge candidate" warning into git-pullJosef Weidendorfer
2006-11-17git-pull: allow pulling into an empty repositoryLinus Torvalds
2006-10-11git-pull: we say commit X, not X commit.Junio C Hamano
2006-07-11Log ref changes made by git-merge and git-pull.Shawn Pearce
2006-07-11Log ref changes made by git-fetch and git-pull.Shawn Pearce
2006-06-27Fix expr usage for FreeBSDDennis Stosberg
2006-06-24git-merge --squashJunio C Hamano
2006-06-24git-pull: abort when fmt-merge-msg fails.Junio C Hamano
2006-03-22git-pull: reword "impossible to fast-forward" message.Junio C Hamano
2006-03-22git-pull: further safety while on tracking branch.Junio C Hamano
2006-03-18git-pull: run repo-config with dash form.Junio C Hamano
2006-03-16Let merge set the default strategy.Mark Hollomon
2006-02-12Avoid using "git-var -l" until it gets fixed.Junio C Hamano
2005-12-14Trivial usage string
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 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