path: root/
AgeCommit message (Expand)Author
2010-05-25pull: do nothing on --dry-runJeff King
2010-03-20Merge branch 'maint'Junio C Hamano
2010-03-20pull: replace unnecessary sed invocationStephen Boyd
2010-02-24fetch and pull: learn --progressTay Ray Chuan
2010-01-24pull: re-fix command line generationJunio C Hamano
2010-01-21Merge branch 'ap/merge-backend-opts'Junio C Hamano
2010-01-18pull: Fix parsing of -X<option>Junio C Hamano
2010-01-18Teach git-pull to pass -X<option> to git-mergeAvery Pennarun
2010-01-12Be more user-friendly when refusing to do something because of conflict.Matthieu Moy
2009-12-09Merge branch 'maint'Junio C Hamano
2009-12-08Revert recent "git merge <msg> HEAD <commit>..." deprecationJunio C Hamano
2009-12-03pull: clarify advice for the unconfigured error caseJan Krüger Fix call to git-merge for new command formatHorst H. von Brand
2009-11-16Merge branch 'fc/doc-fast-forward'Junio C Hamano
2009-10-30Teach 'git merge' and 'git pull' the option --ff-onlyBjörn Gustavsson
2009-10-25Use 'fast-forward' all over the placeFelipe Contreras
2009-10-09pull: improve advice for unconfigured error caseJeff King
2009-10-05git-pull: dead code removalJunio C Hamano
2009-09-23pull: Clarify "helpful" message for another corner casev1.6.5-rc2Junio C Hamano
2009-08-12allow pull --rebase on branch yet to be bornJeff King
2009-07-19pull: support rebased upstream + fetch + pull --rebaseSanti Béjar
2009-06-21Merge branch 'sb/pull-rebase'Junio C Hamano
2009-06-15pull, rebase: simplify to use die()Stephen Boyd
2009-06-12parse-remote: function to get the tracking branch to be mergeSanti Béjar
2009-04-23Convert to use quiet option when availableDan Loewenherz
2009-04-09Merge branch 'maint'Junio C Hamano better warning message for "git pull" on detached head.Matthieu Moy
2009-03-03git-pull: Allow --stat and --no-stat to be used with --rebaseTor Arne Vestbø
2009-02-18disallow providing multiple upstream branches to rebase, pull --rebaseJay Soffian
2008-12-03pull: use git rev-parse -qMiklos Vajna
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