aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-pull.txt
AgeCommit message (Expand)AuthorFilesLines
2024-03-16doc: format alternatives in synopsisJean-Noël Avila1-2/+2
2021-10-18Merge branch 'js/retire-preserve-merges'Junio C Hamano1-5/+1
2021-09-07pull: remove support for `--rebase=preserve`Johannes Schindelin1-5/+1
2021-08-30Merge branch 'en/pull-conflicting-options'Junio C Hamano1-9/+12
2021-07-22pull: update docs & code for option compatibility with rebasingElijah Newren1-5/+4
2021-07-22pull: abort by default when fast-forwarding is not possibleElijah Newren1-8/+12
2021-07-21doc: pull: fix rebase=false documentationFelipe Contreras1-1/+1
2020-04-29Merge branch 'dl/merge-autostash'Junio C Hamano1-9/+0
2020-04-28Merge branch 'dr/doc-recurse-submodules'Junio C Hamano1-2/+3
2020-04-10pull: pass --autostash to mergeDenton Liu1-9/+0
2020-04-06doc: --recurse-submodules mostly applies to active submodulesDamien Robert1-2/+4
2020-04-06doc: be more precise on (fetch|push).recurseSubmodulesDamien Robert1-2/+1
2020-04-05pull doc: correct outdated description of an examplePhilippe Blain1-3/+3
2019-08-05doc: typo: s/can not/cannot/ and s/is does/does/Mark Rushakoff1-1/+1
2019-05-28docs: say that `--rebase=preserve` is deprecatedJohannes Schindelin1-2/+3
2018-05-25Use proper syntax for replaceables in command docsRobert P. J. Day1-1/+1
2018-04-26pull: accept --rebase=merges to recreate the branch topologyJohannes Schindelin1-1/+5
2017-07-13Merge branch 'sb/pull-rebase-submodule'Junio C Hamano1-6/+6
2017-06-23pull: optionally rebase submodules (remote submodule changes only)Stefan Beller1-6/+6
2017-06-18stash: update documentation to use 'stash entry'Liam Beguin1-1/+1
2017-06-02docs: fix formatting and grammarAdam Dinwoodie1-3/+3
2017-05-01doc: git-pull.txt use US spelling, fix minor typoRené Genz1-2/+3
2017-01-10Merge branch 'mm/push-social-engineering-attack-doc'Junio C Hamano1-0/+2
2016-11-14doc: mention transfer data leaks in more placesMatt McCutchen1-0/+2
2016-03-21pull --rebase: add --[no-]autostash flagMehul Jain1-0/+9
2016-01-13pull: allow interactive rebase with --rebase=interactiveJohannes Schindelin1-1/+3
2015-06-02pull: handle git-fetch's options as wellPaul Tan1-3/+0
2015-03-28Merge branch 'ss/pull-rebase-preserve'Junio C Hamano1-3/+2
2015-03-26docs: clarify "preserve" option wording for git-pullSebastian Schuberth1-3/+2
2015-03-13*config.txt: stick to camelCase naming conventionNguyễn Thái Ngọc Duy1-1/+1
2014-01-27Merge branch 'jc/maint-pull-docfix'Junio C Hamano1-2/+2
2014-01-14Merge branch 'jc/maint-pull-docfix-for-409b8d82' into jc/maint-pull-docfixJunio C Hamano1-2/+2
2014-01-14Documentation: exclude irrelevant options from "git pull"Junio C Hamano1-2/+2
2013-10-31doc/pull: clarify the illustrationsJunio C Hamano1-1/+3
2013-09-04pull: allow pull to preserve merges when rebasingStephen Haberman1-6/+12
2013-07-08pull: change the description to "integrate" changesJohn Keeping1-1/+1
2013-03-27Merge branch 'maint-1.8.1' into maintJunio C Hamano1-1/+1
2013-03-27git-pull doc: fix grammo ("conflicts" is plural)Mihai Capotă1-1/+1
2013-02-01Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann1-4/+4
2012-08-17man: git pull -r is a short for --rebaseMiklos Vajna1-0/+1
2012-04-26docs: stop using asciidoc no-inline-literalJeff King1-1/+1
2011-12-09Merge branch 'ab/pull-rebase-config'Junio C Hamano1-1/+1
2011-11-07pull: introduce a pull.rebase option to enable --rebaseÆvar Arnfjörð Bjarmason1-1/+1
2011-07-06Documentation: use [verse] for SYNOPSIS sectionsMartin von Zweigbergk1-0/+1
2011-04-04Merge branch 'jl/submodule-fetch-on-demand'Junio C Hamano1-1/+10
2011-03-11doc: drop author/documentation sections from most pagesJeff King1-12/+0
2011-03-09fetch/pull: Describe --recurse-submodule restrictions in the BUGS sectionJens Lehmann1-0/+9
2011-03-09fetch/pull: Add the 'on-demand' value to the --recurse-submodules optionJens Lehmann1-1/+1
2011-02-07pull: Document the "--[no-]recurse-submodules" optionsJens Lehmann1-0/+9
2010-12-12Merge branch 'ja/maint-pull-rebase-doc'Junio C Hamano1-2/+3
2010-12-03Merge branch 'maint' to sync with Git 1.7.3.3Junio C Hamano1-2/+2
2010-12-03Documentation: do not misinterpret pull refspec as bold textJonathan Nieder1-2/+2
2010-12-03git-pull.txt: Mention branch.autosetuprebaseJari Aalto1-2/+3
2010-11-24Merge branch 'mm/phrase-remote-tracking'Junio C Hamano1-4/+4
2010-11-17Documentation/git-pull: clarify configurationMartin von Zweigbergk1-6/+8
2010-11-03Change "tracking branch" to "remote-tracking branch"Matthieu Moy1-3/+3
2010-11-03Replace "remote tracking" with "remote-tracking"Matthieu Moy1-1/+1
2010-08-02Documentation: flesh out “git pull” descriptionJonathan Nieder1-11/+54
2010-02-24fetch and pull: learn --progressTay Ray Chuan1-1/+3
2010-02-24Documentation/git-pull: put verbosity options before merge/fetch onesTay Ray Chuan1-0/+8
2010-02-24Documentation/git-push: put --quiet before --verboseTay Ray Chuan0-0/+0
2010-01-10Documentation: spell 'git cmd' without dash throughoutThomas Rast1-6/+6
2010-01-09Documentation: warn prominently against merging with dirty treesThomas Rast1-0/+4
2009-10-30Merge branch 'ja/fetch-doc'Junio C Hamano1-0/+7
2009-10-22Documentation/git-pull.txt: Add subtitles above included option filesJari Aalto1-0/+7
2009-10-21modernize fetch/merge/pull examplesClemens Buchacher1-45/+4
2008-07-21Update my e-mail addressJunio C Hamano1-1/+1
2008-07-05manpages: italicize git command names (which were in teletype font)Jonathan Nieder1-5/+5
2008-07-01Documentation formatting and cleanupJonathan Nieder1-2/+1
2008-07-01Documentation: be consistent about "git-" versus "git "Jonathan Nieder1-1/+1
2008-06-12Documentation/git-pull.txt: Use more standard [NOTE] markupJunio C Hamano1-1/+2
2008-06-08Docs: Use "-l::\n--long\n" format in OPTIONS sectionsStephan Beyer1-3/+3
2008-06-06documentation: move git(7) to git(1)Christian Couder1-1/+1
2008-05-06Documentation: improve "add", "pull" and "format-patch" examplesChristian Couder1-34/+52
2008-03-11Merge branch 'maint'Junio C Hamano1-0/+2
2008-03-10git-pull documentation: warn about the option orderJunio C Hamano1-0/+2
2008-02-19Correct git-pull documentationJay Soffian1-8/+12
2008-02-11git-pull documentation: fix markupJunio C Hamano1-5/+5
2008-01-26pull --rebase: be cleverer with rebased upstream branchesJohannes Schindelin1-1/+5
2008-01-25git pull manpage: don't include -n from fetch-options.txtMiklos Vajna1-0/+1
2008-01-06Documentation: rename gitlink macro to linkgitDan McGee1-5/+5
2007-11-28Teach 'git pull' about --rebaseJohannes Schindelin1-0/+10
2007-07-05Add urls.txt to git-clone man pageAndrew Ruder1-1/+1
2007-06-07War on whitespaceJunio C Hamano1-1/+0
2007-02-08Documentation/git-pull: describe default behaviour and config interactionsJunio C Hamano1-0/+54
2007-01-28[PATCH] Rename git-repo-config to git-config.Tom Prince1-2/+2
2007-01-18Documentation: sync git.txt command list and manual page titleJunio C Hamano1-1/+1
2007-01-14some doc updatesNicolas Pitre1-1/+2
2007-01-01Documentation: update git-pull.txt for new clone behaviorJ. Bruce Fields1-44/+25
2006-10-29Mention that pull can work locally in the synopsisRobin Rosenberg1-1/+1
2006-03-09Remove trailing dot after short descriptionFredrik Kuivinen1-1/+1
2006-02-06Docs: move git url and remotes text to separate sectionsJ. Bruce Fields1-1/+2
2005-12-16Examples of resetting.Junio C Hamano1-0/+5
2005-11-06Refactored merge options into separate merge-options.txt.Jon Loeliger1-10/+7
2005-11-06Refactor merge strategies into separate includable file.Jon Loeliger1-35/+1
2005-11-05Documentation: git-fetch/pull updates.Junio C Hamano1-0/+5
2005-11-04Added a few examples to git-pull man page.Jon Loeliger1-9/+54
2005-11-04Documentation: -merge and -pull: describe merge strategies.Junio C Hamano1-1/+67
2005-11-01Document the use of "current directory" as pull source.Junio C Hamano1-0/+3
2005-10-19git-fetch/push/pull: documentation.Junio C Hamano1-0/+4
2005-10-10Remove the version tags from the manpagesJunio C Hamano1-1/+0
2005-09-20[PATCH] Documentation: Update all files to use the new gitlink: macroSergey Vlasov1-1/+1
2005-09-07Big tool rename.Junio C Hamano1-0/+41