summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
AgeCommit message (Expand)AuthorFilesLines
2021-10-18Merge branch 'js/retire-preserve-merges'Libravatar Junio C Hamano1-5/+1
2021-09-07pull: remove support for `--rebase=preserve`Libravatar Johannes Schindelin1-5/+1
2021-08-30Merge branch 'en/pull-conflicting-options'Libravatar Junio C Hamano1-9/+12
2021-07-22pull: update docs & code for option compatibility with rebasingLibravatar Elijah Newren1-5/+4
2021-07-22pull: abort by default when fast-forwarding is not possibleLibravatar Elijah Newren1-8/+12
2021-07-21doc: pull: fix rebase=false documentationLibravatar Felipe Contreras1-1/+1
2020-04-29Merge branch 'dl/merge-autostash'Libravatar Junio C Hamano1-9/+0
2020-04-28Merge branch 'dr/doc-recurse-submodules'Libravatar Junio C Hamano1-2/+3
2020-04-10pull: pass --autostash to mergeLibravatar Denton Liu1-9/+0
2020-04-06doc: --recurse-submodules mostly applies to active submodulesLibravatar Damien Robert1-2/+4
2020-04-06doc: be more precise on (fetch|push).recurseSubmodulesLibravatar Damien Robert1-2/+1
2020-04-05pull doc: correct outdated description of an exampleLibravatar Philippe Blain1-3/+3
2019-08-05doc: typo: s/can not/cannot/ and s/is does/does/Libravatar Mark Rushakoff1-1/+1
2019-05-28docs: say that `--rebase=preserve` is deprecatedLibravatar Johannes Schindelin1-2/+3
2018-05-25Use proper syntax for replaceables in command docsLibravatar Robert P. J. Day1-1/+1
2018-04-26pull: accept --rebase=merges to recreate the branch topologyLibravatar Johannes Schindelin1-1/+5
2017-07-13Merge branch 'sb/pull-rebase-submodule'Libravatar Junio C Hamano1-6/+6
2017-06-23pull: optionally rebase submodules (remote submodule changes only)Libravatar Stefan Beller1-6/+6
2017-06-18stash: update documentation to use 'stash entry'Libravatar Liam Beguin1-1/+1
2017-06-02docs: fix formatting and grammarLibravatar Adam Dinwoodie1-3/+3
2017-05-01doc: git-pull.txt use US spelling, fix minor typoLibravatar René Genz1-2/+3
2017-01-10Merge branch 'mm/push-social-engineering-attack-doc'Libravatar Junio C Hamano1-0/+2
2016-11-14doc: mention transfer data leaks in more placesLibravatar Matt McCutchen1-0/+2
2016-03-21pull --rebase: add --[no-]autostash flagLibravatar Mehul Jain1-0/+9
2016-01-13pull: allow interactive rebase with --rebase=interactiveLibravatar Johannes Schindelin1-1/+3
2015-06-02pull: handle git-fetch's options as wellLibravatar Paul Tan1-3/+0
2015-03-28Merge branch 'ss/pull-rebase-preserve'Libravatar Junio C Hamano1-3/+2
2015-03-26docs: clarify "preserve" option wording for git-pullLibravatar Sebastian Schuberth1-3/+2
2015-03-13*config.txt: stick to camelCase naming conventionLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2014-01-27Merge branch 'jc/maint-pull-docfix'Libravatar Junio C Hamano1-2/+2
2014-01-14Merge branch 'jc/maint-pull-docfix-for-409b8d82' into jc/maint-pull-docfixLibravatar Junio C Hamano1-2/+2
2014-01-14Documentation: exclude irrelevant options from "git pull"Libravatar Junio C Hamano1-2/+2
2013-10-31doc/pull: clarify the illustrationsLibravatar Junio C Hamano1-1/+3
2013-09-04pull: allow pull to preserve merges when rebasingLibravatar Stephen Haberman1-6/+12
2013-07-08pull: change the description to "integrate" changesLibravatar John Keeping1-1/+1
2013-03-27Merge branch 'maint-1.8.1' into maintLibravatar Junio C Hamano1-1/+1
2013-03-27git-pull doc: fix grammo ("conflicts" is plural)Libravatar Mihai Capotă1-1/+1
2013-02-01Documentation: the name of the system is 'Git', not 'git'Libravatar Thomas Ackermann1-4/+4
2012-08-17man: git pull -r is a short for --rebaseLibravatar Miklos Vajna1-0/+1
2012-04-26docs: stop using asciidoc no-inline-literalLibravatar Jeff King1-1/+1
2011-12-09Merge branch 'ab/pull-rebase-config'Libravatar Junio C Hamano1-1/+1
2011-11-07pull: introduce a pull.rebase option to enable --rebaseLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2011-07-06Documentation: use [verse] for SYNOPSIS sectionsLibravatar Martin von Zweigbergk1-0/+1
2011-04-04Merge branch 'jl/submodule-fetch-on-demand'Libravatar Junio C Hamano1-1/+10
2011-03-11doc: drop author/documentation sections from most pagesLibravatar Jeff King1-12/+0
2011-03-09fetch/pull: Describe --recurse-submodule restrictions in the BUGS sectionLibravatar Jens Lehmann1-0/+9
2011-03-09fetch/pull: Add the 'on-demand' value to the --recurse-submodules optionLibravatar Jens Lehmann1-1/+1
2011-02-07pull: Document the "--[no-]recurse-submodules" optionsLibravatar Jens Lehmann1-0/+9
2010-12-12Merge branch 'ja/maint-pull-rebase-doc'Libravatar Junio C Hamano1-2/+3
2010-12-03Merge branch 'maint' to sync with Git 1.7.3.3Libravatar Junio C Hamano1-2/+2