summaryrefslogtreecommitdiff
path: root/git-pull.sh
Commit message (Expand)AuthorAgeFilesLines
* Make git-{pull,rebase} message without tracking information friendliercn/pull-rebase-messageCarlos Martín Nieto2012-03-041-1/+1
* "git pull" doesn't know "--edit"lt/pull-no-editLinus Torvalds2012-02-121-2/+6
* Merge branch 'ab/pull-rebase-config'Junio C Hamano2011-12-091-0/+4
|\
| * pull: introduce a pull.rebase option to enable --rebaseab/pull-rebase-configÆvar Arnfjörð Bjarmason2011-11-071-0/+4
* | Merge branch 'jk/pull-rebase-with-work-tree'Junio C Hamano2011-10-171-1/+1
|\ \
| * | pull,rebase: handle GIT_WORK_TREE betterJeff King2011-10-131-1/+1
* | | use -h for synopsis and --help for manpage consistentlycb/do-not-pretend-to-hijack-long-helpClemens Buchacher2011-10-051-1/+1
* | | Merge branch 'js/i18n-scripts'Junio C Hamano2011-08-251-5/+2
|\ \ \
| * | | pull: take advantage of eval_gettextlnJon Seymour2011-08-081-5/+2
* | | | Merge branch 'oa/pull-reflog'Junio C Hamano2011-08-081-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | pull: remove extra space from reflog messageOri Avtalion2011-08-011-1/+1
| | |/ | |/|
* | | i18n: git-pull eval_gettext + warning messageÆvar Arnfjörð Bjarmason2011-05-211-3/+6
* | | i18n: git-pull eval_gettext + die messageÆvar Arnfjörð Bjarmason2011-05-211-3/+3
* | | i18n: git-pull die messagesÆvar Arnfjörð Bjarmason2011-05-211-9/+9
* | | i18n: git-pull add git-sh-i18nÆvar Arnfjörð Bjarmason2011-05-211-0/+1
|/ /
* | Merge branch 'mz/rebase'Junio C Hamano2011-04-281-28/+4
|\ \
| * | rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk2011-02-101-28/+4
| |/
* | Merge branch 'jl/submodule-fetch-on-demand'Junio C Hamano2011-04-041-0/+3
|\ \
| * | fetch/pull: Add the 'on-demand' value to the --recurse-submodules optionJens Lehmann2011-03-091-0/+3
* | | pull: do not clobber untracked files on initial pullJeff King2011-03-251-1/+1
* | | Merge branch 'jk/merge-rename-ux'Junio C Hamano2011-03-191-2/+4
|\ \ \ | |/ / |/| |
| * | pull: propagate --progress to mergeJeff King2011-02-211-2/+4
| |/
* | pull: do not display fetch usage on --help-allMichael J Gruber2011-02-151-1/+1
|/
* Merge branch 'jl/fetch-submodule-recursive'Junio C Hamano2010-12-161-2/+8
|\
| * Add the 'fetch.recurseSubmodules' config settingJens Lehmann2010-11-121-0/+3
| * fetch/pull: Add the --recurse-submodules optionJens Lehmann2010-11-121-2/+5
* | Porcelain scripts: Rewrite cryptic "needs update" error messageRamkumar Ramachandra2010-10-281-4/+1
|/
* Merge branch 'en/rebase-against-rebase-fix'Junio C Hamano2010-08-211-0/+9
|\
| * pull --rebase: Avoid spurious conflicts and reapplying unnecessary patchesElijah Newren2010-08-121-0/+9
* | pull: do nothing on --dry-runJeff King2010-05-251-1/+6
* | Merge branch 'maint'Junio C Hamano2010-03-201-1/+1
|\ \
| * | pull: replace unnecessary sed invocationStephen Boyd2010-03-201-1/+1
| |/
* | fetch and pull: learn --progressTay Ray Chuan2010-02-241-2/+4
|/
* pull: re-fix command line generationJunio C Hamano2010-01-241-1/+1
* Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-201-5/+25
|\
| * pull: Fix parsing of -X<option>Junio C Hamano2010-01-171-7/+14
| * Teach git-pull to pass -X<option> to git-mergeAvery Pennarun2010-01-171-2/+15
* | Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-121-2/+23
* | Merge branch 'maint'Junio C Hamano2009-12-081-15/+33
|\ \
| * | pull: clarify advice for the unconfigured error caseJan Krüger2009-12-031-15/+33
* | | Revert recent "git merge <msg> HEAD <commit>..." deprecationJunio C Hamano2009-12-081-3/+3
* | | git-pull.sh: Fix call to git-merge for new command formatHorst H. von Brand2009-12-021-3/+3
| |/ |/|
* | Merge branch 'fc/doc-fast-forward'Junio C Hamano2009-11-151-1/+1
|\ \
| * | Use 'fast-forward' all over the placeFelipe Contreras2009-10-241-1/+1
| |/
* | Teach 'git merge' and 'git pull' the option --ff-onlyBjörn Gustavsson2009-10-301-2/+5
|/
* pull: improve advice for unconfigured error caseJeff King2009-10-091-4/+12
* git-pull: dead code removalJunio C Hamano2009-10-051-8/+1
* pull: Clarify "helpful" message for another corner casev1.6.5-rc2Junio C Hamano2009-09-221-1/+6
* allow pull --rebase on branch yet to be bornJeff King2009-08-121-5/+13
* pull: support rebased upstream + fetch + pull --rebaseSanti Béjar2009-07-191-3/+11
View Lorry Controller Status