summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/retire-preserve-merges'Junio C Hamano2021-10-181-5/+1
|\
| * pull: remove support for `--rebase=preserve`Johannes Schindelin2021-09-071-5/+1
* | Merge branch 'en/pull-conflicting-options'Junio C Hamano2021-08-301-9/+12
|\ \ | |/ |/|
| * pull: update docs & code for option compatibility with rebasingElijah Newren2021-07-221-5/+4
| * pull: abort by default when fast-forwarding is not possibleElijah Newren2021-07-221-8/+12
* | doc: pull: fix rebase=false documentationFelipe Contreras2021-07-211-1/+1
|/
* Merge branch 'dl/merge-autostash'Junio C Hamano2020-04-291-9/+0
|\
| * pull: pass --autostash to mergeDenton Liu2020-04-101-9/+0
* | Merge branch 'dr/doc-recurse-submodules'Junio C Hamano2020-04-281-2/+3
|\ \
| * | doc: --recurse-submodules mostly applies to active submodulesDamien Robert2020-04-061-2/+4
| * | doc: be more precise on (fetch|push).recurseSubmodulesDamien Robert2020-04-061-2/+1
| |/
* | pull doc: correct outdated description of an examplePhilippe Blain2020-04-051-3/+3
|/
* doc: typo: s/can not/cannot/ and s/is does/does/Mark Rushakoff2019-08-051-1/+1
* docs: say that `--rebase=preserve` is deprecatedJohannes Schindelin2019-05-281-2/+3
* Use proper syntax for replaceables in command docsRobert P. J. Day2018-05-251-1/+1
* pull: accept --rebase=merges to recreate the branch topologyJohannes Schindelin2018-04-261-1/+5
* Merge branch 'sb/pull-rebase-submodule'Junio C Hamano2017-07-131-6/+6
|\
| * pull: optionally rebase submodules (remote submodule changes only)Stefan Beller2017-06-231-6/+6
* | stash: update documentation to use 'stash entry'Liam Beguin2017-06-181-1/+1
|/
* docs: fix formatting and grammarad/pull-remote-docAdam Dinwoodie2017-06-021-3/+3
* doc: git-pull.txt use US spelling, fix minor typorg/doc-pull-typofixRené Genz2017-05-011-2/+3
* Merge branch 'mm/push-social-engineering-attack-doc'Junio C Hamano2017-01-101-0/+2
|\
| * doc: mention transfer data leaks in more placesmm/push-social-engineering-attack-docMatt McCutchen2016-11-141-0/+2
* | pull --rebase: add --[no-]autostash flagMehul Jain2016-03-211-0/+9
|/
* pull: allow interactive rebase with --rebase=interactiveJohannes Schindelin2016-01-131-1/+3
* pull: handle git-fetch's options as wellPaul Tan2015-06-021-3/+0
* Merge branch 'ss/pull-rebase-preserve'Junio C Hamano2015-03-281-3/+2
|\
| * docs: clarify "preserve" option wording for git-pullSebastian Schuberth2015-03-261-3/+2
* | *config.txt: stick to camelCase naming conventionnd/config-doc-camelCaseNguyễn Thái Ngọc Duy2015-03-131-1/+1
|/
* Merge branch 'jc/maint-pull-docfix'Junio C Hamano2014-01-271-2/+2
|\
| * Merge branch 'jc/maint-pull-docfix-for-409b8d82' into jc/maint-pull-docfixJunio C Hamano2014-01-141-2/+2
| |\
| | * Documentation: exclude irrelevant options from "git pull"jc/maint-pull-docfix-for-409b8d82Junio C Hamano2014-01-141-2/+2
* | | doc/pull: clarify the illustrationsJunio C Hamano2013-10-311-1/+3
* | | pull: allow pull to preserve merges when rebasingsh/pull-rebase-preserveStephen Haberman2013-09-041-6/+12
* | | pull: change the description to "integrate" changesjk/pull-to-integrateJohn Keeping2013-07-081-1/+1
|/ /
* | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-03-271-1/+1
|\ \
| * | git-pull doc: fix grammo ("conflicts" is plural)Mihai Capotă2013-03-271-1/+1
* | | Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann2013-02-011-4/+4
|/ /
* | man: git pull -r is a short for --rebaseMiklos Vajna2012-08-171-0/+1
* | docs: stop using asciidoc no-inline-literalJeff King2012-04-261-1/+1
* | Merge branch 'ab/pull-rebase-config'Junio C Hamano2011-12-091-1/+1
|\ \
| * | pull: introduce a pull.rebase option to enable --rebaseab/pull-rebase-configÆvar Arnfjörð Bjarmason2011-11-071-1/+1
* | | Documentation: use [verse] for SYNOPSIS sectionsMartin von Zweigbergk2011-07-061-0/+1
|/ /
* | Merge branch 'jl/submodule-fetch-on-demand'Junio C Hamano2011-04-041-1/+10
|\ \
| * | fetch/pull: Describe --recurse-submodule restrictions in the BUGS sectionJens Lehmann2011-03-091-0/+9
| * | fetch/pull: Add the 'on-demand' value to the --recurse-submodules optionJens Lehmann2011-03-091-1/+1
* | | doc: drop author/documentation sections from most pagesJeff King2011-03-111-12/+0
|/ /
* | pull: Document the "--[no-]recurse-submodules" optionsJens Lehmann2011-02-071-0/+9
* | Merge branch 'ja/maint-pull-rebase-doc'Junio C Hamano2010-12-121-2/+3
|\ \
| * | git-pull.txt: Mention branch.autosetuprebaseJari Aalto2010-12-031-2/+3
View Lorry Controller Status