summaryrefslogtreecommitdiffstats
path: root/git-pull.sh
AgeCommit message (Expand)AuthorLines
2011-04-04Merge branch 'jl/submodule-fetch-on-demand'Junio C Hamano-0/+3
2011-03-25pull: do not clobber untracked files on initial pullJeff King-1/+1
2011-03-19Merge branch 'jk/merge-rename-ux'Junio C Hamano-2/+4
2011-03-09fetch/pull: Add the 'on-demand' value to the --recurse-submodules optionJens Lehmann-0/+3
2011-02-21pull: propagate --progress to mergeJeff King-2/+4
2011-02-15pull: do not display fetch usage on --help-allMichael J Gruber-1/+1
2010-12-16Merge branch 'jl/fetch-submodule-recursive'Junio C Hamano-2/+8
2010-11-12Add the 'fetch.recurseSubmodules' config settingJens Lehmann-0/+3
2010-11-12fetch/pull: Add the --recurse-submodules optionJens Lehmann-2/+5
2010-10-28Porcelain scripts: Rewrite cryptic "needs update" error messageRamkumar Ramachandra-4/+1
2010-08-21Merge branch 'en/rebase-against-rebase-fix'Junio C Hamano-0/+9
2010-08-12pull --rebase: Avoid spurious conflicts and reapplying unnecessary patchesElijah Newren-0/+9
2010-05-25pull: do nothing on --dry-runJeff King-1/+6
2010-03-20Merge branch 'maint'Junio C Hamano-1/+1
2010-03-20pull: replace unnecessary sed invocationStephen Boyd-1/+1
2010-02-24fetch and pull: learn --progressTay Ray Chuan-2/+4
2010-01-24pull: re-fix command line generationJunio C Hamano-1/+1
2010-01-20Merge branch 'ap/merge-backend-opts'Junio C Hamano-5/+25
2010-01-17pull: Fix parsing of -X<option>Junio C Hamano-7/+14
2010-01-17Teach git-pull to pass -X<option> to git-mergeAvery Pennarun-2/+15
2010-01-12Be more user-friendly when refusing to do something because of conflict.Matthieu Moy-2/+23
2009-12-08Merge branch 'maint'Junio C Hamano-15/+33
2009-12-08Revert recent "git merge <msg> HEAD <commit>..." deprecationJunio C Hamano-3/+3
2009-12-03pull: clarify advice for the unconfigured error caseJan Krüger-15/+33
2009-12-02git-pull.sh: Fix call to git-merge for new command formatHorst H. von Brand-3/+3
2009-11-15Merge branch 'fc/doc-fast-forward'Junio C Hamano-1/+1
2009-10-30Teach 'git merge' and 'git pull' the option --ff-onlyBjörn Gustavsson-2/+5
2009-10-24Use 'fast-forward' all over the placeFelipe Contreras-1/+1
2009-10-09pull: improve advice for unconfigured error caseJeff King-4/+12
2009-10-05git-pull: dead code removalJunio C Hamano-8/+1
2009-09-22pull: Clarify "helpful" message for another corner casev1.6.5-rc2Junio C Hamano-1/+6
2009-08-12allow pull --rebase on branch yet to be bornJeff King-5/+13
2009-07-19pull: support rebased upstream + fetch + pull --rebaseSanti Béjar-3/+11
2009-06-20Merge branch 'sb/pull-rebase'Junio C Hamano-5/+2
2009-06-14pull, rebase: simplify to use die()Stephen Boyd-4/+2
2009-06-11parse-remote: function to get the tracking branch to be mergeSanti Béjar-5/+2
2009-04-22Convert to use quiet option when availableDan Loewenherz-1/+1
2009-04-08Merge branch 'maint'Junio C Hamano-17/+25
2009-04-08git-pull.sh: better warning message for "git pull" on detached head.Matthieu Moy-17/+25
2009-03-02git-pull: Allow --stat and --no-stat to be used with --rebaseTor Arne Vestbø-5/+5
2009-02-18disallow providing multiple upstream branches to rebase, pull --rebaseJay Soffian-0/+5
2008-12-03pull: use git rev-parse -qMiklos Vajna-4/+4
2008-11-18Retain multiple -q/-v occurrences in git pullTuncer Ayaz-2/+2
2008-11-14Teach/Fix pull/fetch -q/-v optionsTuncer Ayaz-3/+7
2008-10-17pull: allow "git pull origin $something:$current_branch" into an unborn branchJunio C Hamano-2/+2
2008-07-23Ignore dirty submodule states in "git pull --rebase"Johannes Schindelin-3/+3
2008-07-13Make usage strings dash-lessStephan Beyer-1/+1
2008-05-22pull --rebase: exit early when the working directory is dirtyJohannes Schindelin-0/+5
2008-04-12merge, pull: add '--(no-)log' command line optionSZEDER Gábor-3/+5
2008-04-12merge, pull: introduce '--(no-)stat' optionSZEDER Gábor-9/+7