aboutsummaryrefslogtreecommitdiff
path: root/git-pull.sh
Commit message (Expand)AuthorAge
* Merge branch 'js/i18n-scripts'Junio C Hamano2011-08-25
|\
| * pull: take advantage of eval_gettextlnJon Seymour2011-08-08
* | Merge branch 'oa/pull-reflog'Junio C Hamano2011-08-08
|\ \ | |/ |/|
| * pull: remove extra space from reflog messageOri Avtalion2011-08-01
* | i18n: git-pull eval_gettext + warning messageÆvar Arnfjörð Bjarmason2011-05-21
* | i18n: git-pull eval_gettext + die messageÆvar Arnfjörð Bjarmason2011-05-21
* | i18n: git-pull die messagesÆvar Arnfjörð Bjarmason2011-05-21
* | i18n: git-pull add git-sh-i18nÆvar Arnfjörð Bjarmason2011-05-21
|/
* Merge branch 'mz/rebase'Junio C Hamano2011-04-28
|\
| * rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk2011-02-10
* | Merge branch 'jl/submodule-fetch-on-demand'Junio C Hamano2011-04-04
|\ \
| * | fetch/pull: Add the 'on-demand' value to the --recurse-submodules optionJens Lehmann2011-03-09
* | | pull: do not clobber untracked files on initial pullJeff King2011-03-25
* | | Merge branch 'jk/merge-rename-ux'Junio C Hamano2011-03-19
|\ \ \ | |/ / |/| |
| * | pull: propagate --progress to mergeJeff King2011-02-21
| |/
* | pull: do not display fetch usage on --help-allMichael J Gruber2011-02-15
|/
* Merge branch 'jl/fetch-submodule-recursive'Junio C Hamano2010-12-16
|\
| * Add the 'fetch.recurseSubmodules' config settingJens Lehmann2010-11-12
| * fetch/pull: Add the --recurse-submodules optionJens Lehmann2010-11-12
* | Porcelain scripts: Rewrite cryptic "needs update" error messageRamkumar Ramachandra2010-10-28
|/
* Merge branch 'en/rebase-against-rebase-fix'Junio C Hamano2010-08-21
|\
| * pull --rebase: Avoid spurious conflicts and reapplying unnecessary patchesElijah Newren2010-08-12
* | pull: do nothing on --dry-runJeff King2010-05-25
* | Merge branch 'maint'Junio C Hamano2010-03-20
|\ \
| * | pull: replace unnecessary sed invocationStephen Boyd2010-03-20
| |/
* | fetch and pull: learn --progressTay Ray Chuan2010-02-24
|/
* pull: re-fix command line generationJunio C Hamano2010-01-24
* Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-20
|\
| * pull: Fix parsing of -X<option>Junio C Hamano2010-01-17
| * Teach git-pull to pass -X<option> to git-mergeAvery Pennarun2010-01-17
* | Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-12
* | Merge branch 'maint'Junio C Hamano2009-12-08
|\ \
| * | pull: clarify advice for the unconfigured error caseJan Krüger2009-12-03
* | | Revert recent "git merge <msg> HEAD <commit>..." deprecationJunio C Hamano2009-12-08
* | | git-pull.sh: Fix call to git-merge for new command formatHorst H. von Brand2009-12-02
| |/ |/|
* | Merge branch 'fc/doc-fast-forward'Junio C Hamano2009-11-15
|\ \
| * | Use 'fast-forward' all over the placeFelipe Contreras2009-10-24
| |/
* | Teach 'git merge' and 'git pull' the option --ff-onlyBjörn Gustavsson2009-10-30
|/
* pull: improve advice for unconfigured error caseJeff King2009-10-09
* git-pull: dead code removalJunio C Hamano2009-10-05
* pull: Clarify "helpful" message for another corner casev1.6.5-rc2Junio C Hamano2009-09-22
* allow pull --rebase on branch yet to be bornJeff King2009-08-12
* pull: support rebased upstream + fetch + pull --rebaseSanti Béjar2009-07-19
* Merge branch 'sb/pull-rebase'Junio C Hamano2009-06-20
|\
| * parse-remote: function to get the tracking branch to be mergeSanti Béjar2009-06-11
* | pull, rebase: simplify to use die()Stephen Boyd2009-06-14
|/
* Convert to use quiet option when availableDan Loewenherz2009-04-22
* Merge branch 'maint'Junio C Hamano2009-04-08
|\
| * git-pull.sh: better warning message for "git pull" on detached head.Matthieu Moy2009-04-08
* | git-pull: Allow --stat and --no-stat to be used with --rebaseTor Arne Vestbø2009-03-02
|/