summaryrefslogtreecommitdiff
path: root/git-pull.sh
AgeCommit message (Expand)Author
2011-08-08Merge branch 'oa/pull-reflog'Junio C Hamano
2011-08-01pull: remove extra space from reflog messageOri Avtalion
2011-05-21i18n: git-pull eval_gettext + warning messageÆvar Arnfjörð Bjarmason
2011-05-21i18n: git-pull eval_gettext + die messageÆvar Arnfjörð Bjarmason
2011-05-21i18n: git-pull die messagesÆvar Arnfjörð Bjarmason
2011-05-21i18n: git-pull add git-sh-i18nÆvar Arnfjörð Bjarmason
2011-04-28Merge branch 'mz/rebase'Junio C Hamano
2011-04-04Merge branch 'jl/submodule-fetch-on-demand'Junio C Hamano
2011-03-25pull: do not clobber untracked files on initial pullJeff King
2011-03-20Merge branch 'jk/merge-rename-ux'Junio C Hamano
2011-03-09fetch/pull: Add the 'on-demand' value to the --recurse-submodules optionJens Lehmann
2011-02-21pull: propagate --progress to mergeJeff King
2011-02-15pull: do not display fetch usage on --help-allMichael J Gruber
2011-02-10rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk
2010-12-16Merge branch 'jl/fetch-submodule-recursive'Junio C Hamano
2010-11-12Add the 'fetch.recurseSubmodules' config settingJens Lehmann
2010-11-12fetch/pull: Add the --recurse-submodules optionJens Lehmann
2010-10-28Porcelain scripts: Rewrite cryptic "needs update" error messageRamkumar Ramachandra
2010-08-22Merge branch 'en/rebase-against-rebase-fix'Junio C Hamano
2010-08-13pull --rebase: Avoid spurious conflicts and reapplying unnecessary patchesElijah Newren
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
2009-12-02git-pull.sh: 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
2009-04-08git-pull.sh: 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