Git - git-pull Documentation

<!DOCTYPE html> <html lang="en"> <head> <script type="text/javascript"> const currentTheme = localStorage.getItem("theme") if (currentTheme) { const prefersDarkScheme = window.matchMedia("(prefers-color-scheme: dark)").matches if ((prefersDarkScheme && currentTheme === "light") || (!prefersDarkScheme && currentTheme === "dark")) { document.documentElement.dataset.theme = currentTheme } } </script> <meta charset='utf-8'> <meta content='IE=edge,chrome=1' http-equiv='X-UA-Compatible'> <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Git - git-pull Documentation</title> <link href="/favicon.ico" rel='shortcut icon' type='image/x-icon'> <link rel="stylesheet" href="/application.min.css"> </head> <body id="documentation"> <div class="inner"> <header> <a id="logo" href="/"><img src="/images/logo@2x.png" width="110" height="46" alt="Git" class="no-filter" /></a> <span id="tagline"></span> <script type="text/javascript"> const taglines = [ "fast-version-control", "everything-is-local", "distributed-even-if-your-workflow-isnt", "local-branching-on-the-cheap", "distributed-is-the-new-centralized" ]; var tagline = taglines[Math.floor(Math.random() * taglines.length)]; document.getElementById('tagline').innerHTML = '--' + tagline; </script> <div id="search-container"> <form id="search" action="/search/results"> <input id="search-text" name="search" placeholder="Type / to search entire site…" autocomplete="off" type="text" /> </form> <div id="search-results"></div> </div> <img src="/images/dark-mode.svg" id="dark-mode-button" /> </header> </div> <div class="inner"> <div id="content-wrapper"> <div tabindex="1" class="sidebar-btn"></div> <aside class="sidebar" id="sidebar"> <nav> <ul> <li> <a href="/about">About</a> <ul> </ul> </li> <li> <a href="/doc" class="active">Documentation</a> <ul class="expanded"> <li> <a href="/docs" class="active">Reference</a> </li> <li> <a href="/book">Book</a> </li> <li> <a href="/videos">Videos</a> </li> <li> <a href="/doc/ext">External Links</a> </li> </ul> </li> <li> <a href="/downloads">Downloads</a> <ul > <li> <a href="/downloads/guis">GUI Clients</a> </li> <li> <a href="/downloads/logos">Logos</a> </li> </ul> </li> <li> <a href="/community">Community</a> </li> </ul> </nav> </aside> <div id="content"> <div id='reference-version'> <a class="dropdown-trigger" id="reference-languages-trigger" data-panel-id="l10n-versions-dropdown" href="#"> English ▾</a> <div class='dropdown-panel right' id='l10n-versions-dropdown'> <header>Localized versions of <strong>git-pull</strong> manual</header> <ol class='reference-previous-versions'> <li> <a href="/docs/git-pull"><span class="version">English</span> </a> </li> <li> <a href="/docs/git-pull/fr"><span class="version">Français</span> </a> </li> <li> <a href="/docs/git-pull/pt_BR"><span class="version">Português (Brasil)</span> </a> </li> <li> <a href="/docs/git-pull/zh_HANS-CN"><span class="version">简体中文</span> </a> </li> </ol> <footer> Want to read in your language or fix typos?<br/> <a href="https://github.com/jnavila/git-manpages-l10n">You can help translate this page</a>. </footer> </div> <a class="dropdown-trigger" id="reference-topics-trigger" data-panel-id="topics-dropdown" href="#">Topics ▾</a> <div class='dropdown-panel right' id='topics-dropdown'> <div class='three-column'> <div class='column-left'> <h3 class='setup'>Setup and Config</h3> <ul class='unstyled'> <li> <a href="/docs/git"> git </a> </li> <li> <a href="/docs/git-config"> config </a> </li> <li> <a href="/docs/git-help"> help </a> </li> <li> <a href="/docs/git-bugreport"> bugreport </a> </li> <li> <a href="/doc/credential-helpers"> Credential helpers </a> </li> </ul> <h3 class='projects'>Getting and Creating Projects</h3> <ul class='unstyled'> <li> <a href="/docs/git-init"> init </a> </li> <li> <a href="/docs/git-clone"> clone </a> </li> </ul> <h3 class='snapshotting'>Basic Snapshotting</h3> <ul class='unstyled'> <li> <a href="/docs/git-add"> add </a> </li> <li> <a href="/docs/git-status"> status </a> </li> <li> <a href="/docs/git-diff"> diff </a> </li> <li> <a href="/docs/git-commit"> commit </a> </li> <li> <a href="/docs/git-notes"> notes </a> </li> <li> <a href="/docs/git-restore"> restore </a> </li> <li> <a href="/docs/git-reset"> reset </a> </li> <li> <a href="/docs/git-rm"> rm </a> </li> <li> <a href="/docs/git-mv"> mv </a> </li> </ul> <h3 class='branching'>Branching and Merging</h3> <ul class='unstyled'> <li> <a href="/docs/git-branch"> branch </a> </li> <li> <a href="/docs/git-checkout"> checkout </a> </li> <li> <a href="/docs/git-switch"> switch </a> </li> <li> <a href="/docs/git-merge"> merge </a> </li> <li> <a href="/docs/git-mergetool"> mergetool </a> </li> <li> <a href="/docs/git-log"> log </a> </li> <li> <a href="/docs/git-stash"> stash </a> </li> <li> <a href="/docs/git-tag"> tag </a> </li> <li> <a href="/docs/git-worktree"> worktree </a> </li> </ul> <h3 class='sharing'>Sharing and Updating Projects</h3> <ul class='unstyled'> <li> <a href="/docs/git-fetch"> fetch </a> </li> <li> <a href="/docs/git-pull"> pull </a> </li> <li> <a href="/docs/git-push"> push </a> </li> <li> <a href="/docs/git-remote"> remote </a> </li> <li> <a href="/docs/git-submodule"> submodule </a> </li> </ul> </div> <div class='column-middle'> <h3 class='inspection'>Inspection and Comparison</h3> <ul class='unstyled'> <li> <a href="/docs/git-show"> show </a> </li> <li> <a href="/docs/git-log"> log </a> </li> <li> <a href="/docs/git-diff"> diff </a> </li> <li> <a href="/docs/git-difftool"> difftool </a> </li> <li> <a href="/docs/git-range-diff"> range-diff </a> </li> <li> <a href="/docs/git-shortlog"> shortlog </a> </li> <li> <a href="/docs/git-describe"> describe </a> </li> </ul> <h3 class='patching'>Patching</h3> <ul class='unstyled'> <li> <a href="/docs/git-apply"> apply </a> </li> <li> <a href="/docs/git-cherry-pick"> cherry-pick </a> </li> <li> <a href="/docs/git-diff"> diff </a> </li> <li> <a href="/docs/git-rebase"> rebase </a> </li> <li> <a href="/docs/git-revert"> revert </a> </li> </ul> <h3 class='debugging'>Debugging</h3> <ul class='unstyled'> <li> <a href="/docs/git-bisect"> bisect </a> </li> <li> <a href="/docs/git-blame"> blame </a> </li> <li> <a href="/docs/git-grep"> grep </a> </li> </ul> <h3 class='email'>Email</h3> <ul class='unstyled'> <li> <a href="/docs/git-am"> am </a> </li> <li> <a href="/docs/git-apply"> apply </a> </li> <li> <a href="/docs/git-format-patch"> format-patch </a> </li> <li> <a href="/docs/git-send-email"> send-email </a> </li> <li> <a href="/docs/git-request-pull"> request-pull </a> </li> </ul> <h3 class='external'>External Systems</h3> <ul class='unstyled'> <li> <a href="/docs/git-svn"> svn </a> </li> <li> <a href="/docs/git-fast-import"> fast-import </a> </li> </ul> <h3 class='server-admin'>Server Admin</h3> <ul class='unstyled'> <li> <a href="/docs/git-daemon"> daemon </a> </li> <li> <a href="/docs/git-update-server-info"> update-server-info </a> </li> </ul> </div> <div class='column-right'> <h3 class='guides'>Guides</h3> <ul class='unstyled'> <li> <a href="/docs/gitattributes"> gitattributes </a> </li> <li> <a href="/docs/gitcli"> Command-line interface conventions </a> </li> <li> <a href="/docs/giteveryday"> Everyday Git </a> </li> <li> <a href="/docs/gitfaq"> Frequently Asked Questions (FAQ) </a> </li> <li> <a href="/docs/gitglossary"> Glossary </a> </li> <li> <a href="/docs/githooks"> Hooks </a> </li> <li> <a href="/docs/gitignore"> gitignore </a> </li> <li> <a href="/docs/gitmodules"> gitmodules </a> </li> <li> <a href="/docs/gitrevisions"> Revisions </a> </li> <li> <a href="/docs/gitsubmodules"> Submodules </a> </li> <li> <a href="/docs/gittutorial"> Tutorial </a> </li> <li> <a href="/docs/gitworkflows"> Workflows </a> </li> <li> <a href="/docs/git#_guides"> All guides... </a> </li> </ul> <h3 class='admin'>Administration</h3> <ul class='unstyled'> <li> <a href="/docs/git-clean"> clean </a> </li> <li> <a href="/docs/git-gc"> gc </a> </li> <li> <a href="/docs/git-fsck"> fsck </a> </li> <li> <a href="/docs/git-reflog"> reflog </a> </li> <li> <a href="/docs/git-filter-branch"> filter-branch </a> </li> <li> <a href="/docs/git-instaweb"> instaweb </a> </li> <li> <a href="/docs/git-archive"> archive </a> </li> <li> <a href="/docs/git-bundle"> bundle </a> </li> </ul> <h3 class='plumbing'>Plumbing Commands</h3> <ul class='unstyled'> <li> <a href="/docs/git-cat-file"> cat-file </a> </li> <li> <a href="/docs/git-check-ignore"> check-ignore </a> </li> <li> <a href="/docs/git-checkout-index"> checkout-index </a> </li> <li> <a href="/docs/git-commit-tree"> commit-tree </a> </li> <li> <a href="/docs/git-count-objects"> count-objects </a> </li> <li> <a href="/docs/git-diff-index"> diff-index </a> </li> <li> <a href="/docs/git-for-each-ref"> for-each-ref </a> </li> <li> <a href="/docs/git-hash-object"> hash-object </a> </li> <li> <a href="/docs/git-ls-files"> ls-files </a> </li> <li> <a href="/docs/git-ls-tree"> ls-tree </a> </li> <li> <a href="/docs/git-merge-base"> merge-base </a> </li> <li> <a href="/docs/git-read-tree"> read-tree </a> </li> <li> <a href="/docs/git-rev-list"> rev-list </a> </li> <li> <a href="/docs/git-rev-parse"> rev-parse </a> </li> <li> <a href="/docs/git-show-ref"> show-ref </a> </li> <li> <a href="/docs/git-symbolic-ref"> symbolic-ref </a> </li> <li> <a href="/docs/git-update-index"> update-index </a> </li> <li> <a href="/docs/git-update-ref"> update-ref </a> </li> <li> <a href="/docs/git-verify-pack"> verify-pack </a> </li> <li> <a href="/docs/git-write-tree"> write-tree </a> </li> </ul> </div> </div> </div> <a class="dropdown-trigger" id="reference-versions-trigger" data-panel-id="previous-versions-dropdown" href="#"> Version 2.8.6 ▾ </a> <span class="light d-flex">git-pull last updated in 2.49.0</span> <div class='dropdown-panel left' id='previous-versions-dropdown'> <header>Changes in the <strong>git-pull</strong> manual</header> <ol class='reference-previous-versions'> <li> <a href="/docs/git-pull/2.49.0"><span class="version">2.49.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2025-03-14</em> </a> </li> <li class="no-change"><span>2.48.1 no changes</span></li> <li> <a href="/docs/git-pull/2.48.0"><span class="version">2.48.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2025-01-10</em> </a> </li> <li class="no-change"><span>2.47.2 no changes</span></li> <li> <a href="/docs/git-pull/2.47.1"><span class="version">2.47.1</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2024-11-25</em> </a> </li> <li class="no-change"><span>2.46.3 → 2.47.0 no changes</span></li> <li> <a href="/docs/git-pull/2.46.2"><span class="version">2.46.2</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2024-09-23</em> </a> </li> <li class="no-change"><span>2.45.1 → 2.46.1 no changes</span></li> <li> <a href="/docs/git-pull/2.45.0"><span class="version">2.45.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2024-04-29</em> </a> </li> <li class="no-change"><span>2.44.1 → 2.44.3 no changes</span></li> <li> <a href="/docs/git-pull/2.44.0"><span class="version">2.44.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2024-02-23</em> </a> </li> <li class="no-change"><span>2.43.2 → 2.43.6 no changes</span></li> <li> <a href="/docs/git-pull/2.43.1"><span class="version">2.43.1</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2024-02-09</em> </a> </li> <li> <a href="/docs/git-pull/2.43.0"><span class="version">2.43.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2023-11-20</em> </a> </li> <li class="no-change"><span>2.42.1 → 2.42.4 no changes</span></li> <li> <a href="/docs/git-pull/2.42.0"><span class="version">2.42.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2023-08-21</em> </a> </li> <li class="no-change"><span>2.41.1 → 2.41.3 no changes</span></li> <li> <a href="/docs/git-pull/2.41.0"><span class="version">2.41.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2023-06-01</em> </a> </li> <li class="no-change"><span>2.40.1 → 2.40.4 no changes</span></li> <li> <a href="/docs/git-pull/2.40.0"><span class="version">2.40.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2023-03-12</em> </a> </li> <li class="no-change"><span>2.36.1 → 2.39.5 no changes</span></li> <li> <a href="/docs/git-pull/2.36.0"><span class="version">2.36.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2022-04-18</em> </a> </li> <li class="no-change"><span>2.35.1 → 2.35.8 no changes</span></li> <li> <a href="/docs/git-pull/2.35.0"><span class="version">2.35.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2022-01-24</em> </a> </li> <li class="no-change"><span>2.34.1 → 2.34.8 no changes</span></li> <li> <a href="/docs/git-pull/2.34.0"><span class="version">2.34.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2021-11-15</em> </a> </li> <li class="no-change"><span>2.33.2 → 2.33.8 no changes</span></li> <li> <a href="/docs/git-pull/2.33.1"><span class="version">2.33.1</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2021-10-12</em> </a> </li> <li> <a href="/docs/git-pull/2.33.0"><span class="version">2.33.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2021-08-16</em> </a> </li> <li class="no-change"><span>2.32.1 → 2.32.7 no changes</span></li> <li> <a href="/docs/git-pull/2.32.0"><span class="version">2.32.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2021-06-06</em> </a> </li> <li class="no-change"><span>2.31.1 → 2.31.8 no changes</span></li> <li> <a href="/docs/git-pull/2.31.0"><span class="version">2.31.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2021-03-15</em> </a> </li> <li class="no-change"><span>2.30.1 → 2.30.9 no changes</span></li> <li> <a href="/docs/git-pull/2.30.0"><span class="version">2.30.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2020-12-27</em> </a> </li> <li class="no-change"><span>2.29.1 → 2.29.3 no changes</span></li> <li> <a href="/docs/git-pull/2.29.0"><span class="version">2.29.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2020-10-19</em> </a> </li> <li class="no-change"><span>2.27.1 → 2.28.1 no changes</span></li> <li> <a href="/docs/git-pull/2.27.0"><span class="version">2.27.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2020-06-01</em> </a> </li> <li class="no-change"><span>2.25.2 → 2.26.3 no changes</span></li> <li> <a href="/docs/git-pull/2.25.1"><span class="version">2.25.1</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2020-02-17</em> </a> </li> <li> <a href="/docs/git-pull/2.25.0"><span class="version">2.25.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2020-01-13</em> </a> </li> <li class="no-change"><span>2.24.1 → 2.24.4 no changes</span></li> <li> <a href="/docs/git-pull/2.24.0"><span class="version">2.24.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2019-11-04</em> </a> </li> <li class="no-change"><span>2.23.1 → 2.23.4 no changes</span></li> <li> <a href="/docs/git-pull/2.23.0"><span class="version">2.23.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2019-08-16</em> </a> </li> <li class="no-change"><span>2.22.2 → 2.22.5 no changes</span></li> <li> <a href="/docs/git-pull/2.22.1"><span class="version">2.22.1</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2019-08-11</em> </a> </li> <li> <a href="/docs/git-pull/2.22.0"><span class="version">2.22.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2019-06-07</em> </a> </li> <li class="no-change"><span>2.20.1 → 2.21.4 no changes</span></li> <li> <a href="/docs/git-pull/2.20.0"><span class="version">2.20.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2018-12-09</em> </a> </li> <li class="no-change"><span>2.19.1 → 2.19.6 no changes</span></li> <li> <a href="/docs/git-pull/2.19.0"><span class="version">2.19.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2018-09-10</em> </a> </li> <li class="no-change"><span>2.18.1 → 2.18.5 no changes</span></li> <li> <a href="/docs/git-pull/2.18.0"><span class="version">2.18.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2018-06-21</em> </a> </li> <li class="no-change"><span>2.17.1 → 2.17.6 no changes</span></li> <li> <a href="/docs/git-pull/2.17.0"><span class="version">2.17.0</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2018-04-02</em> </a> </li> <li> <a href="/docs/git-pull/2.16.6"><span class="version">2.16.6</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2019-12-06</em> </a> </li> <li> <a href="/docs/git-pull/2.15.4"><span class="version">2.15.4</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2019-12-06</em> </a> </li> <li> <a href="/docs/git-pull/2.14.6"><span class="version">2.14.6</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2019-12-06</em> </a> </li> <li> <a href="/docs/git-pull/2.13.7"><span class="version">2.13.7</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2018-05-22</em> </a> </li> <li class="no-change"><span>2.12.5 no changes</span></li> <li> <a href="/docs/git-pull/2.11.4"><span class="version">2.11.4</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2017-09-22</em> </a> </li> <li class="no-change"><span>2.10.5 no changes</span></li> <li> <a href="/docs/git-pull/2.9.5"><span class="version">2.9.5</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2017-07-30</em> </a> </li> <li> <a href="/docs/git-pull/2.8.6"><span class="version">2.8.6</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2017-07-30</em> </a> </li> <li> <a href="/docs/git-pull/2.7.6"><span class="version">2.7.6</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2017-07-30</em> </a> </li> <li> <a href="/docs/git-pull/2.6.7"><span class="version">2.6.7</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2017-05-05</em> </a> </li> <li class="no-change"><span>2.5.6 no changes</span></li> <li> <a href="/docs/git-pull/2.4.12"><span class="version">2.4.12</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2017-05-05</em> </a> </li> <li> <a href="/docs/git-pull/2.3.10"><span class="version">2.3.10</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2015-09-28</em> </a> </li> <li class="no-change"><span>2.2.3 no changes</span></li> <li> <a href="/docs/git-pull/2.1.4"><span class="version">2.1.4</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2014-12-17</em> </a> </li> <li> <a href="/docs/git-pull/2.0.5"><span class="version">2.0.5</span> <span class="diff"> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/green-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/red-dot.png" /> <img src="/images/icons/grey-dot.png" /> <img src="/images/icons/grey-dot.png" /> </span> <em class="date">2014-12-17</em> </a> </li> <li> </li> </ol> <footer> <p>Check your version of git by running</p> <code class="command">git --version</code> </footer> </div> </div> <div id="main"> <div class="sect1"> <h2 id="_name"><a class="anchor" href="#_name"></a>NAME</h2> <div class="sectionbody"> <div class="paragraph"> <p>git-pull - Fetch from and integrate with another repository or a local branch</p> </div> </div> </div> <div class="sect1"> <h2 id="_synopsis"><a class="anchor" href="#_synopsis"></a>SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> <pre class="content"><em>git pull</em> [options] [<repository> [<refspec>…]]</pre> </div> </div> </div> <div class="sect1"> <h2 id="_description"><a class="anchor" href="#_description"></a>DESCRIPTION</h2> <div class="sectionbody"> <div class="paragraph"> <p>Incorporates changes from a remote repository into the current branch. In its default mode, <code>git pull</code> is shorthand for <code>git fetch</code> followed by <code>git merge FETCH_HEAD</code>.</p> </div> <div class="paragraph"> <p>More precisely, <em>git pull</em> runs <em>git fetch</em> with the given parameters and calls <em>git merge</em> to merge the retrieved branch heads into the current branch. With <code>--rebase</code>, it runs <em>git rebase</em> instead of <em>git merge</em>.</p> </div> <div class="paragraph"> <p><repository> should be the name of a remote repository as passed to <a href='/docs/git-fetch'>git-fetch[1]</a>. <refspec> can name an arbitrary remote ref (for example, the name of a tag) or even a collection of refs with corresponding remote-tracking branches (e.g., refs/heads/*:refs/remotes/origin/*), but usually it is the name of a branch in the remote repository.</p> </div> <div class="paragraph"> <p>Default values for <repository> and <branch> are read from the "remote" and "merge" configuration for the current branch as set by <a href='/docs/git-branch'>git-branch[1]</a> <code>--track</code>.</p> </div> <div class="paragraph"> <p>Assume the following history exists and the current branch is "<code>master</code>":</p> </div> <div class="listingblock"> <div class="content"> <pre> A---B---C master on origin / D---E---F---G master ^ origin/master in your repository</pre> </div> </div> <div class="paragraph"> <p>Then "<code>git pull</code>" will fetch and replay the changes from the remote <code>master</code> branch since it diverged from the local <code>master</code> (i.e., <code>E</code>) until its current commit (<code>C</code>) on top of <code>master</code> and record the result in a new commit along with the names of the two parent commits and a log message from the user describing the changes.</p> </div> <div class="listingblock"> <div class="content"> <pre> A---B---C origin/master / \ D---E---F---G---H master</pre> </div> </div> <div class="paragraph"> <p>See <a href='/docs/git-merge'>git-merge[1]</a> for details, including how conflicts are presented and handled.</p> </div> <div class="paragraph"> <p>In Git 1.7.0 or later, to cancel a conflicting merge, use <code>git reset --merge</code>. <strong>Warning</strong>: In older versions of Git, running <em>git pull</em> with uncommitted changes is discouraged: while possible, it leaves you in a state that may be hard to back out of in the case of a conflict.</p> </div> <div class="paragraph"> <p>If any of the remote changes overlap with local uncommitted changes, the merge will be automatically cancelled and the work tree untouched. It is generally best to get any local changes in working order before pulling or stash them away with <a href='/docs/git-stash'>git-stash[1]</a>.</p> </div> </div> </div> <div class="sect1"> <h2 id="_options"><a class="anchor" href="#_options"></a>OPTIONS</h2> <div class="sectionbody"> <div class="dlist"> <dl> <dt class="hdlist1" id="Documentation/git-pull.txt--q"> <a class="anchor" href="#Documentation/git-pull.txt--q"></a>-q </dt> <dt class="hdlist1" id="Documentation/git-pull.txt---quiet"> <a class="anchor" href="#Documentation/git-pull.txt---quiet"></a>--quiet </dt> <dd> <p>This is passed to both underlying git-fetch to squelch reporting of during transfer, and underlying git-merge to squelch output during merging.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt--v"> <a class="anchor" href="#Documentation/git-pull.txt--v"></a>-v </dt> <dt class="hdlist1" id="Documentation/git-pull.txt---verbose"> <a class="anchor" href="#Documentation/git-pull.txt---verbose"></a>--verbose </dt> <dd> <p>Pass --verbose to git-fetch and git-merge.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt---no-recurse-submodulesyeson-demandno"> <a class="anchor" href="#Documentation/git-pull.txt---no-recurse-submodulesyeson-demandno"></a>--[no-]recurse-submodules[=yes|on-demand|no] </dt> <dd> <p>This option controls if new commits of all populated submodules should be fetched too (see <a href='/docs/git-config'>git-config[1]</a> and <a href='/docs/gitmodules'>gitmodules[5]</a>). That might be necessary to get the data needed for merging submodule commits, a feature Git learned in 1.7.3. Notice that the result of a merge will not be checked out in the submodule, "git submodule update" has to be called afterwards to bring the work tree up to date with the merge result.</p> </dd> </dl> </div> <div class="sect2"> <h3 id="_options_related_to_merging"><a class="anchor" href="#_options_related_to_merging"></a>Options related to merging</h3> <div class="dlist"> <dl> <dt class="hdlist1" id="Documentation/git-pull.txt---commit"> <a class="anchor" href="#Documentation/git-pull.txt---commit"></a>--commit </dt> <dt class="hdlist1" id="Documentation/git-pull.txt---no-commit"> <a class="anchor" href="#Documentation/git-pull.txt---no-commit"></a>--no-commit </dt> <dd> <p>Perform the merge and commit the result. This option can be used to override --no-commit.</p> <div class="paragraph"> <p>With --no-commit perform the merge but pretend the merge failed and do not autocommit, to give the user a chance to inspect and further tweak the merge result before committing.</p> </div> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt---edit"> <a class="anchor" href="#Documentation/git-pull.txt---edit"></a>--edit </dt> <dt class="hdlist1" id="Documentation/git-pull.txt--e"> <a class="anchor" href="#Documentation/git-pull.txt--e"></a>-e </dt> <dt class="hdlist1" id="Documentation/git-pull.txt---no-edit"> <a class="anchor" href="#Documentation/git-pull.txt---no-edit"></a>--no-edit </dt> <dd> <p>Invoke an editor before committing successful mechanical merge to further edit the auto-generated merge message, so that the user can explain and justify the merge. The <code>--no-edit</code> option can be used to accept the auto-generated message (this is generally discouraged).</p> <div class="paragraph"> <p>Older scripts may depend on the historical behaviour of not allowing the user to edit the merge log message. They will see an editor opened when they run <code>git merge</code>. To make it easier to adjust such scripts to the updated behaviour, the environment variable <code>GIT_MERGE_AUTOEDIT</code> can be set to <code>no</code> at the beginning of them.</p> </div> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt---ff"> <a class="anchor" href="#Documentation/git-pull.txt---ff"></a>--ff </dt> <dd> <p>When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default behavior.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt---no-ff"> <a class="anchor" href="#Documentation/git-pull.txt---no-ff"></a>--no-ff </dt> <dd> <p>Create a merge commit even when the merge resolves as a fast-forward. This is the default behaviour when merging an annotated (and possibly signed) tag.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt---ff-only"> <a class="anchor" href="#Documentation/git-pull.txt---ff-only"></a>--ff-only </dt> <dd> <p>Refuse to merge and exit with a non-zero status unless the current <code>HEAD</code> is already up-to-date or the merge can be resolved as a fast-forward.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt---logltngt"> <a class="anchor" href="#Documentation/git-pull.txt---logltngt"></a>--log[=<n>] </dt> <dt class="hdlist1" id="Documentation/git-pull.txt---no-log"> <a class="anchor" href="#Documentation/git-pull.txt---no-log"></a>--no-log </dt> <dd> <p>In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also <a href='/docs/git-fmt-merge-msg'>git-fmt-merge-msg[1]</a>.</p> <div class="paragraph"> <p>With --no-log do not list one-line descriptions from the actual commits being merged.</p> </div> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt---stat"> <a class="anchor" href="#Documentation/git-pull.txt---stat"></a>--stat </dt> <dt class="hdlist1" id="Documentation/git-pull.txt--n"> <a class="anchor" href="#Documentation/git-pull.txt--n"></a>-n </dt> <dt class="hdlist1" id="Documentation/git-pull.txt---no-stat"> <a class="anchor" href="#Documentation/git-pull.txt---no-stat"></a>--no-stat </dt> <dd> <p>Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat.</p> <div class="paragraph"> <p>With -n or --no-stat do not show a diffstat at the end of the merge.</p> </div> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt---squash"> <a class="anchor" href="#Documentation/git-pull.txt---squash"></a>--squash </dt> <dt class="hdlist1" id="Documentation/git-pull.txt---no-squash"> <a class="anchor" href="#Documentation/git-pull.txt---no-squash"></a>--no-squash </dt> <dd> <p>Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the <code>HEAD</code>, or record <code>$GIT_DIR/MERGE_HEAD</code> (to cause the next <code>git commit</code> command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus).</p> <div class="paragraph"> <p>With --no-squash perform the merge and commit the result. This option can be used to override --squash.</p> </div> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt--sltstrategygt"> <a class="anchor" href="#Documentation/git-pull.txt--sltstrategygt"></a>-s <strategy> </dt> <dt class="hdlist1" id="Documentation/git-pull.txt---strategyltstrategygt"> <a class="anchor" href="#Documentation/git-pull.txt---strategyltstrategygt"></a>--strategy=<strategy> </dt> <dd> <p>Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no <code>-s</code> option, a built-in list of strategies is used instead (<em>git merge-recursive</em> when merging a single head, <em>git merge-octopus</em> otherwise).</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt--Xltoptiongt"> <a class="anchor" href="#Documentation/git-pull.txt--Xltoptiongt"></a>-X <option> </dt> <dt class="hdlist1" id="Documentation/git-pull.txt---strategy-optionltoptiongt"> <a class="anchor" href="#Documentation/git-pull.txt---strategy-optionltoptiongt"></a>--strategy-option=<option> </dt> <dd> <p>Pass merge strategy specific option through to the merge strategy.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt---verify-signatures"> <a class="anchor" href="#Documentation/git-pull.txt---verify-signatures"></a>--verify-signatures </dt> <dt class="hdlist1" id="Documentation/git-pull.txt---no-verify-signatures"> <a class="anchor" href="#Documentation/git-pull.txt---no-verify-signatures"></a>--no-verify-signatures </dt> <dd> <p>Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt---summary"> <a class="anchor" href="#Documentation/git-pull.txt---summary"></a>--summary </dt> <dt class="hdlist1" id="Documentation/git-pull.txt---no-summary"> <a class="anchor" href="#Documentation/git-pull.txt---no-summary"></a>--no-summary </dt> <dd> <p>Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt--r"> <a class="anchor" href="#Documentation/git-pull.txt--r"></a>-r </dt> <dt class="hdlist1" id="Documentation/git-pull.txt---rebasefalsetruepreserveinteractive"> <a class="anchor" href="#Documentation/git-pull.txt---rebasefalsetruepreserveinteractive"></a>--rebase[=false|true|preserve|interactive] </dt> <dd> <p>When true, rebase the current branch on top of the upstream branch after fetching. If there is a remote-tracking branch corresponding to the upstream branch and the upstream branch was rebased since last fetched, the rebase uses that information to avoid rebasing non-local changes.</p> <div class="paragraph"> <p>When set to preserve, rebase with the <code>--preserve-merges</code> option passed to <code>git rebase</code> so that locally created merge commits will not be flattened.</p> </div> <div class="paragraph"> <p>When false, merge the current branch into the upstream branch.</p> </div> <div class="paragraph"> <p>When <code>interactive</code>, enable the interactive mode of rebase.</p> </div> <div class="paragraph"> <p>See <code>pull.rebase</code>, <code>branch.<name>.rebase</code> and <code>branch.autoSetupRebase</code> in <a href='/docs/git-config'>git-config[1]</a> if you want to make <code>git pull</code> always use <code>--rebase</code> instead of merging.</p> </div> <div class="admonitionblock note"> <table> <tr> <td class="icon"> <div class="title">Note</div> </td> <td class="content"> This is a potentially <em>dangerous</em> mode of operation. It rewrites history, which does not bode well when you published that history already. Do <strong>not</strong> use this option unless you have read <a href='/docs/git-rebase'>git-rebase[1]</a> carefully. </td> </tr> </table> </div> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt---no-rebase"> <a class="anchor" href="#Documentation/git-pull.txt---no-rebase"></a>--no-rebase </dt> <dd> <p>Override earlier --rebase.</p> </dd> </dl> </div> </div> <div class="sect2"> <h3 id="_options_related_to_fetching"><a class="anchor" href="#_options_related_to_fetching"></a>Options related to fetching</h3> <div class="dlist"> <dl> <dt class="hdlist1" id="Documentation/git-pull.txt---all"> <a class="anchor" href="#Documentation/git-pull.txt---all"></a>--all </dt> <dd> <p>Fetch all remotes.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt--a"> <a class="anchor" href="#Documentation/git-pull.txt--a"></a>-a </dt> <dt class="hdlist1" id="Documentation/git-pull.txt---append"> <a class="anchor" href="#Documentation/git-pull.txt---append"></a>--append </dt> <dd> <p>Append ref names and object names of fetched refs to the existing contents of <code>.git/FETCH_HEAD</code>. Without this option old data in <code>.git/FETCH_HEAD</code> will be overwritten.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt---depthltdepthgt"> <a class="anchor" href="#Documentation/git-pull.txt---depthltdepthgt"></a>--depth=<depth> </dt> <dd> <p>Limit fetching to the specified number of commits from the tip of each remote branch history. If fetching to a <em>shallow</em> repository created by <code>git clone</code> with <code>--depth=<depth></code> option (see <a href='/docs/git-clone'>git-clone[1]</a>), deepen or shorten the history to the specified number of commits. Tags for the deepened commits are not fetched.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt---unshallow"> <a class="anchor" href="#Documentation/git-pull.txt---unshallow"></a>--unshallow </dt> <dd> <p>If the source repository is complete, convert a shallow repository to a complete one, removing all the limitations imposed by shallow repositories.</p> <div class="paragraph"> <p>If the source repository is shallow, fetch as much as possible so that the current repository has the same history as the source repository.</p> </div> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt---update-shallow"> <a class="anchor" href="#Documentation/git-pull.txt---update-shallow"></a>--update-shallow </dt> <dd> <p>By default when fetching from a shallow repository, <code>git fetch</code> refuses refs that require updating .git/shallow. This option updates .git/shallow and accept such refs.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt--f"> <a class="anchor" href="#Documentation/git-pull.txt--f"></a>-f </dt> <dt class="hdlist1" id="Documentation/git-pull.txt---force"> <a class="anchor" href="#Documentation/git-pull.txt---force"></a>--force </dt> <dd> <p>When <em>git fetch</em> is used with <code><rbranch>:<lbranch></code> refspec, it refuses to update the local branch <code><lbranch></code> unless the remote branch <code><rbranch></code> it fetches is a descendant of <code><lbranch></code>. This option overrides that check.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt--k"> <a class="anchor" href="#Documentation/git-pull.txt--k"></a>-k </dt> <dt class="hdlist1" id="Documentation/git-pull.txt---keep"> <a class="anchor" href="#Documentation/git-pull.txt---keep"></a>--keep </dt> <dd> <p>Keep downloaded pack.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt---no-tags"> <a class="anchor" href="#Documentation/git-pull.txt---no-tags"></a>--no-tags </dt> <dd> <p>By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following. The default behavior for a remote may be specified with the remote.<name>.tagOpt setting. See <a href='/docs/git-config'>git-config[1]</a>.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt--u"> <a class="anchor" href="#Documentation/git-pull.txt--u"></a>-u </dt> <dt class="hdlist1" id="Documentation/git-pull.txt---update-head-ok"> <a class="anchor" href="#Documentation/git-pull.txt---update-head-ok"></a>--update-head-ok </dt> <dd> <p>By default <em>git fetch</em> refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for <em>git pull</em> to communicate with <em>git fetch</em>, and unless you are implementing your own Porcelain you are not supposed to use it.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt---upload-packltupload-packgt"> <a class="anchor" href="#Documentation/git-pull.txt---upload-packltupload-packgt"></a>--upload-pack <upload-pack> </dt> <dd> <p>When given, and the repository to fetch from is handled by <em>git fetch-pack</em>, <em>--exec=<upload-pack></em> is passed to the command to specify non-default path for the command run on the other end.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt---progress"> <a class="anchor" href="#Documentation/git-pull.txt---progress"></a>--progress </dt> <dd> <p>Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt--4"> <a class="anchor" href="#Documentation/git-pull.txt--4"></a>-4 </dt> <dt class="hdlist1" id="Documentation/git-pull.txt---ipv4"> <a class="anchor" href="#Documentation/git-pull.txt---ipv4"></a>--ipv4 </dt> <dd> <p>Use IPv4 addresses only, ignoring IPv6 addresses.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt--6"> <a class="anchor" href="#Documentation/git-pull.txt--6"></a>-6 </dt> <dt class="hdlist1" id="Documentation/git-pull.txt---ipv6"> <a class="anchor" href="#Documentation/git-pull.txt---ipv6"></a>--ipv6 </dt> <dd> <p>Use IPv6 addresses only, ignoring IPv4 addresses.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt-ltrepositorygt"> <a class="anchor" href="#Documentation/git-pull.txt-ltrepositorygt"></a><repository> </dt> <dd> <p>The "remote" repository that is the source of a fetch or pull operation. This parameter can be either a URL (see the section <a href="#URLS">GIT URLS</a> below) or the name of a remote (see the section <a href="#REMOTES">REMOTES</a> below).</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt-ltrefspecgt"> <a class="anchor" href="#Documentation/git-pull.txt-ltrefspecgt"></a><refspec> </dt> <dd> <p>Specifies which refs to fetch and which local refs to update. When no <refspec>s appear on the command line, the refs to fetch are read from <code>remote.<repository>.fetch</code> variables instead (see <a href='/docs/git-fetch'>git-fetch[1]</a>).</p> <div class="paragraph"> <p>The format of a <refspec> parameter is an optional plus <code>+</code>, followed by the source ref <src>, followed by a colon <code>:</code>, followed by the destination ref <dst>. The colon can be omitted when <dst> is empty.</p> </div> <div class="paragraph"> <p><code>tag <tag></code> means the same as <code>refs/tags/<tag>:refs/tags/<tag></code>; it requests fetching everything up to the given tag.</p> </div> <div class="paragraph"> <p>The remote ref that matches <src> is fetched, and if <dst> is not empty string, the local ref that matches it is fast-forwarded using <src>. If the optional plus <code>+</code> is used, the local ref is updated even if it does not result in a fast-forward update.</p> </div> <div class="admonitionblock note"> <table> <tr> <td class="icon"> <div class="title">Note</div> </td> <td class="content"> When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the <code>+</code> sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch. </td> </tr> </table> </div> <div class="admonitionblock note"> <table> <tr> <td class="icon"> <div class="title">Note</div> </td> <td class="content"> There is a difference between listing multiple <refspec> directly on <em>git pull</em> command line and having multiple <code>remote.<repository>.fetch</code> entries in your configuration for a <repository> and running a <em>git pull</em> command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, <em>git pull</em> will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, <em>git pull</em> will fetch all the <refspec>s it finds in the <code>remote.<repository>.fetch</code> configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful. </td> </tr> </table> </div> </dd> </dl> </div> </div> </div> </div> <div class="sect1"> <h2 id="_git_urls"><a class="anchor" href="#_git_urls"></a>GIT URLS<a id="URLS"></a></h2> <div class="sectionbody"> <div class="paragraph"> <p>In general, URLs contain information about the transport protocol, the address of the remote server, and the path to the repository. Depending on the transport protocol, some of this information may be absent.</p> </div> <div class="paragraph"> <p>Git supports ssh, git, http, and https protocols (in addition, ftp, and ftps can be used for fetching, but this is inefficient and deprecated; do not use it).</p> </div> <div class="paragraph"> <p>The native transport (i.e. git:// URL) does no authentication and should be used with caution on unsecured networks.</p> </div> <div class="paragraph"> <p>The following syntaxes may be used with them:</p> </div> <div class="ulist"> <ul> <li> <p>ssh://[user@]host.xz[:port]/path/to/repo.git/</p> </li> <li> <p>git://host.xz[:port]/path/to/repo.git/</p> </li> <li> <p>http[s]://host.xz[:port]/path/to/repo.git/</p> </li> <li> <p>ftp[s]://host.xz[:port]/path/to/repo.git/</p> </li> </ul> </div> <div class="paragraph"> <p>An alternative scp-like syntax may also be used with the ssh protocol:</p> </div> <div class="ulist"> <ul> <li> <p>[user@]host.xz:path/to/repo.git/</p> </li> </ul> </div> <div class="paragraph"> <p>This syntax is only recognized if there are no slashes before the first colon. This helps differentiate a local path that contains a colon. For example the local path <code>foo:bar</code> could be specified as an absolute path or <code>./foo:bar</code> to avoid being misinterpreted as an ssh url.</p> </div> <div class="paragraph"> <p>The ssh and git protocols additionally support ~username expansion:</p> </div> <div class="ulist"> <ul> <li> <p>ssh://[user@]host.xz[:port]/~[user]/path/to/repo.git/</p> </li> <li> <p>git://host.xz[:port]/~[user]/path/to/repo.git/</p> </li> <li> <p>[user@]host.xz:/~[user]/path/to/repo.git/</p> </li> </ul> </div> <div class="paragraph"> <p>For local repositories, also supported by Git natively, the following syntaxes may be used:</p> </div> <div class="ulist"> <ul> <li> <p>/path/to/repo.git/</p> </li> <li> <p>file:///path/to/repo.git/</p> </li> </ul> </div> <div class="paragraph"> <p>These two syntaxes are mostly equivalent, except when cloning, when the former implies --local option. See <a href='/docs/git-clone'>git-clone[1]</a> for details.</p> </div> <div class="paragraph"> <p>When Git doesn’t know how to handle a certain transport protocol, it attempts to use the <em>remote-<transport></em> remote helper, if one exists. To explicitly request a remote helper, the following syntax may be used:</p> </div> <div class="ulist"> <ul> <li> <p><transport>::<address></p> </li> </ul> </div> <div class="paragraph"> <p>where <address> may be a path, a server and path, or an arbitrary URL-like string recognized by the specific remote helper being invoked. See <a href='/docs/gitremote-helpers'>gitremote-helpers[1]</a> for details.</p> </div> <div class="paragraph"> <p>If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:</p> </div> <div class="listingblock"> <div class="content"> <pre> [url "<actual url base>"] insteadOf = <other url base></pre> </div> </div> <div class="paragraph"> <p>For example, with this:</p> </div> <div class="listingblock"> <div class="content"> <pre> [url "git://git.host.xz/"] insteadOf = host.xz:/path/to/ insteadOf = work:</pre> </div> </div> <div class="paragraph"> <p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p> </div> <div class="paragraph"> <p>If you want to rewrite URLs for push only, you can create a configuration section of the form:</p> </div> <div class="listingblock"> <div class="content"> <pre> [url "<actual url base>"] pushInsteadOf = <other url base></pre> </div> </div> <div class="paragraph"> <p>For example, with this:</p> </div> <div class="listingblock"> <div class="content"> <pre> [url "ssh://example.org/"] pushInsteadOf = git://example.org/</pre> </div> </div> <div class="paragraph"> <p>a URL like "git://example.org/path/to/repo.git" will be rewritten to "ssh://example.org/path/to/repo.git" for pushes, but pulls will still use the original URL.</p> </div> </div> </div> <div class="sect1"> <h2 id="_remotes"><a class="anchor" href="#_remotes"></a>REMOTES<a id="REMOTES"></a></h2> <div class="sectionbody"> <div class="paragraph"> <p>The name of one of the following can be used instead of a URL as <code><repository></code> argument:</p> </div> <div class="ulist"> <ul> <li> <p>a remote in the Git configuration file: <code>$GIT_DIR/config</code>,</p> </li> <li> <p>a file in the <code>$GIT_DIR/remotes</code> directory, or</p> </li> <li> <p>a file in the <code>$GIT_DIR/branches</code> directory.</p> </li> </ul> </div> <div class="paragraph"> <p>All of these also allow you to omit the refspec from the command line because they each contain a refspec which git will use by default.</p> </div> <div class="sect2"> <h3 id="_named_remote_in_configuration_file"><a class="anchor" href="#_named_remote_in_configuration_file"></a>Named remote in configuration file</h3> <div class="paragraph"> <p>You can choose to provide the name of a remote which you had previously configured using <a href='/docs/git-remote'>git-remote[1]</a>, <a href='/docs/git-config'>git-config[1]</a> or even by a manual edit to the <code>$GIT_DIR/config</code> file. The URL of this remote will be used to access the repository. The refspec of this remote will be used by default when you do not provide a refspec on the command line. The entry in the config file would appear like this:</p> </div> <div class="listingblock"> <div class="content"> <pre> [remote "<name>"] url = <url> pushurl = <pushurl> push = <refspec> fetch = <refspec></pre> </div> </div> <div class="paragraph"> <p>The <code><pushurl></code> is used for pushes only. It is optional and defaults to <code><url></code>.</p> </div> </div> <div class="sect2"> <h3 id="_named_file_in_git_dirremotes"><a class="anchor" href="#_named_file_in_git_dirremotes"></a>Named file in <code>$GIT_DIR/remotes</code></h3> <div class="paragraph"> <p>You can choose to provide the name of a file in <code>$GIT_DIR/remotes</code>. The URL in this file will be used to access the repository. The refspec in this file will be used as default when you do not provide a refspec on the command line. This file should have the following format:</p> </div> <div class="listingblock"> <div class="content"> <pre> URL: one of the above URL format Push: <refspec> Pull: <refspec></pre> </div> </div> <div class="paragraph"> <p><code>Push:</code> lines are used by <em>git push</em> and <code>Pull:</code> lines are used by <em>git pull</em> and <em>git fetch</em>. Multiple <code>Push:</code> and <code>Pull:</code> lines may be specified for additional branch mappings.</p> </div> </div> <div class="sect2"> <h3 id="_named_file_in_git_dirbranches"><a class="anchor" href="#_named_file_in_git_dirbranches"></a>Named file in <code>$GIT_DIR/branches</code></h3> <div class="paragraph"> <p>You can choose to provide the name of a file in <code>$GIT_DIR/branches</code>. The URL in this file will be used to access the repository. This file should have the following format:</p> </div> <div class="listingblock"> <div class="content"> <pre> <url>#<head></pre> </div> </div> <div class="paragraph"> <p><code><url></code> is required; <code>#<head></code> is optional.</p> </div> <div class="paragraph"> <p>Depending on the operation, git will use one of the following refspecs, if you don’t provide one on the command line. <code><branch></code> is the name of this file in <code>$GIT_DIR/branches</code> and <code><head></code> defaults to <code>master</code>.</p> </div> <div class="paragraph"> <p>git fetch uses:</p> </div> <div class="listingblock"> <div class="content"> <pre> refs/heads/<head>:refs/heads/<branch></pre> </div> </div> <div class="paragraph"> <p>git push uses:</p> </div> <div class="listingblock"> <div class="content"> <pre> HEAD:refs/heads/<head></pre> </div> </div> </div> </div> </div> <div class="sect1"> <h2 id="_merge_strategies"><a class="anchor" href="#_merge_strategies"></a>MERGE STRATEGIES</h2> <div class="sectionbody"> <div class="paragraph"> <p>The merge mechanism (<code>git merge</code> and <code>git pull</code> commands) allows the backend <em>merge strategies</em> to be chosen with <code>-s</code> option. Some strategies can also take their own options, which can be passed by giving <code>-X<option></code> arguments to <code>git merge</code> and/or <code>git pull</code>.</p> </div> <div class="dlist"> <dl> <dt class="hdlist1" id="Documentation/git-pull.txt-resolve"> <a class="anchor" href="#Documentation/git-pull.txt-resolve"></a>resolve </dt> <dd> <p>This can only resolve two heads (i.e. the current branch and another branch you pulled from) using a 3-way merge algorithm. It tries to carefully detect criss-cross merge ambiguities and is considered generally safe and fast.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt-recursive"> <a class="anchor" href="#Documentation/git-pull.txt-recursive"></a>recursive </dt> <dd> <p>This can only resolve two heads using a 3-way merge algorithm. When there is more than one common ancestor that can be used for 3-way merge, it creates a merged tree of the common ancestors and uses that as the reference tree for the 3-way merge. This has been reported to result in fewer merge conflicts without causing mismerges by tests done on actual merge commits taken from Linux 2.6 kernel development history. Additionally this can detect and handle merges involving renames. This is the default merge strategy when pulling or merging one branch.</p> <div class="paragraph"> <p>The <em>recursive</em> strategy can take the following options:</p> </div> <div class="dlist"> <dl> <dt class="hdlist1" id="Documentation/git-pull.txt-ours"> <a class="anchor" href="#Documentation/git-pull.txt-ours"></a>ours </dt> <dd> <p>This option forces conflicting hunks to be auto-resolved cleanly by favoring <em>our</em> version. Changes from the other tree that do not conflict with our side are reflected to the merge result. For a binary file, the entire contents are taken from our side.</p> <div class="paragraph"> <p>This should not be confused with the <em>ours</em> merge strategy, which does not even look at what the other tree contains at all. It discards everything the other tree did, declaring <em>our</em> history contains all that happened in it.</p> </div> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt-theirs"> <a class="anchor" href="#Documentation/git-pull.txt-theirs"></a>theirs </dt> <dd> <p>This is the opposite of <em>ours</em>.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt-patience"> <a class="anchor" href="#Documentation/git-pull.txt-patience"></a>patience </dt> <dd> <p>With this option, <em>merge-recursive</em> spends a little extra time to avoid mismerges that sometimes occur due to unimportant matching lines (e.g., braces from distinct functions). Use this when the branches to be merged have diverged wildly. See also <a href='/docs/git-diff'>git-diff[1]</a> <code>--patience</code>.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt-diff-algorithmpatienceminimalhistogrammyers"> <a class="anchor" href="#Documentation/git-pull.txt-diff-algorithmpatienceminimalhistogrammyers"></a>diff-algorithm=[patience|minimal|histogram|myers] </dt> <dd> <p>Tells <em>merge-recursive</em> to use a different diff algorithm, which can help avoid mismerges that occur due to unimportant matching lines (such as braces from distinct functions). See also <a href='/docs/git-diff'>git-diff[1]</a> <code>--diff-algorithm</code>.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt-ignore-space-change"> <a class="anchor" href="#Documentation/git-pull.txt-ignore-space-change"></a>ignore-space-change </dt> <dt class="hdlist1" id="Documentation/git-pull.txt-ignore-all-space"> <a class="anchor" href="#Documentation/git-pull.txt-ignore-all-space"></a>ignore-all-space </dt> <dt class="hdlist1" id="Documentation/git-pull.txt-ignore-space-at-eol"> <a class="anchor" href="#Documentation/git-pull.txt-ignore-space-at-eol"></a>ignore-space-at-eol </dt> <dd> <p>Treats lines with the indicated type of whitespace change as unchanged for the sake of a three-way merge. Whitespace changes mixed with other changes to a line are not ignored. See also <a href='/docs/git-diff'>git-diff[1]</a> <code>-b</code>, <code>-w</code>, and <code>--ignore-space-at-eol</code>.</p> <div class="ulist"> <ul> <li> <p>If <em>their</em> version only introduces whitespace changes to a line, <em>our</em> version is used;</p> </li> <li> <p>If <em>our</em> version introduces whitespace changes but <em>their</em> version includes a substantial change, <em>their</em> version is used;</p> </li> <li> <p>Otherwise, the merge proceeds in the usual way.</p> </li> </ul> </div> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt-renormalize"> <a class="anchor" href="#Documentation/git-pull.txt-renormalize"></a>renormalize </dt> <dd> <p>This runs a virtual check-out and check-in of all three stages of a file when resolving a three-way merge. This option is meant to be used when merging branches with different clean filters or end-of-line normalization rules. See "Merging branches with differing checkin/checkout attributes" in <a href='/docs/gitattributes'>gitattributes[5]</a> for details.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt-no-renormalize"> <a class="anchor" href="#Documentation/git-pull.txt-no-renormalize"></a>no-renormalize </dt> <dd> <p>Disables the <code>renormalize</code> option. This overrides the <code>merge.renormalize</code> configuration variable.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt-no-renames"> <a class="anchor" href="#Documentation/git-pull.txt-no-renames"></a>no-renames </dt> <dd> <p>Turn off rename detection. See also <a href='/docs/git-diff'>git-diff[1]</a> <code>--no-renames</code>.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt-find-renamesltngt"> <a class="anchor" href="#Documentation/git-pull.txt-find-renamesltngt"></a>find-renames[=<n>] </dt> <dd> <p>Turn on rename detection, optionally setting the similarity threshold. This is the default. See also <a href='/docs/git-diff'>git-diff[1]</a> <code>--find-renames</code>.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt-rename-thresholdltngt"> <a class="anchor" href="#Documentation/git-pull.txt-rename-thresholdltngt"></a>rename-threshold=<n> </dt> <dd> <p>Deprecated synonym for <code>find-renames=<n></code>.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt-subtreeltpathgt"> <a class="anchor" href="#Documentation/git-pull.txt-subtreeltpathgt"></a>subtree[=<path>] </dt> <dd> <p>This option is a more advanced form of <em>subtree</em> strategy, where the strategy makes a guess on how two trees must be shifted to match with each other when merging. Instead, the specified path is prefixed (or stripped from the beginning) to make the shape of two trees to match.</p> </dd> </dl> </div> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt-octopus"> <a class="anchor" href="#Documentation/git-pull.txt-octopus"></a>octopus </dt> <dd> <p>This resolves cases with more than two heads, but refuses to do a complex merge that needs manual resolution. It is primarily meant to be used for bundling topic branch heads together. This is the default merge strategy when pulling or merging more than one branch.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt-ours-1"> <a class="anchor" href="#Documentation/git-pull.txt-ours-1"></a>ours </dt> <dd> <p>This resolves any number of heads, but the resulting tree of the merge is always that of the current branch head, effectively ignoring all changes from all other branches. It is meant to be used to supersede old development history of side branches. Note that this is different from the -Xours option to the <em>recursive</em> merge strategy.</p> </dd> <dt class="hdlist1" id="Documentation/git-pull.txt-subtree"> <a class="anchor" href="#Documentation/git-pull.txt-subtree"></a>subtree </dt> <dd> <p>This is a modified recursive strategy. When merging trees A and B, if B corresponds to a subtree of A, B is first adjusted to match the tree structure of A, instead of reading the trees at the same level. This adjustment is also done to the common ancestor tree.</p> </dd> </dl> </div> <div class="paragraph"> <p>With the strategies that use 3-way merge (including the default, <em>recursive</em>), if a change is made on both branches, but later reverted on one of the branches, that change will be present in the merged result; some people find this behavior confusing. It occurs because only the heads and the merge base are considered when performing a merge, not the individual commits. The merge algorithm therefore considers the reverted change as no change at all, and substitutes the changed version instead.</p> </div> </div> </div> <div class="sect1"> <h2 id="_default_behaviour"><a class="anchor" href="#_default_behaviour"></a>DEFAULT BEHAVIOUR</h2> <div class="sectionbody"> <div class="paragraph"> <p>Often people use <code>git pull</code> without giving any parameter. Traditionally, this has been equivalent to saying <code>git pull origin</code>. However, when configuration <code>branch.<name>.remote</code> is present while on branch <code><name></code>, that value is used instead of <code>origin</code>.</p> </div> <div class="paragraph"> <p>In order to determine what URL to use to fetch from, the value of the configuration <code>remote.<origin>.url</code> is consulted and if there is not any such variable, the value on <code>URL: ` line in `$GIT_DIR/remotes/<origin></code> file is used.</p> </div> <div class="paragraph"> <p>In order to determine what remote branches to fetch (and optionally store in the remote-tracking branches) when the command is run without any refspec parameters on the command line, values of the configuration variable <code>remote.<origin>.fetch</code> are consulted, and if there aren’t any, <code>$GIT_DIR/remotes/<origin></code> file is consulted and its `Pull: ` lines are used. In addition to the refspec formats described in the OPTIONS section, you can have a globbing refspec that looks like this:</p> </div> <div class="listingblock"> <div class="content"> <pre>refs/heads/*:refs/remotes/origin/*</pre> </div> </div> <div class="paragraph"> <p>A globbing refspec must have a non-empty RHS (i.e. must store what were fetched in remote-tracking branches), and its LHS and RHS must end with <code>/*</code>. The above specifies that all remote branches are tracked using remote-tracking branches in <code>refs/remotes/origin/</code> hierarchy under the same name.</p> </div> <div class="paragraph"> <p>The rule to determine which remote branch to merge after fetching is a bit involved, in order not to break backward compatibility.</p> </div> <div class="paragraph"> <p>If explicit refspecs were given on the command line of <code>git pull</code>, they are all merged.</p> </div> <div class="paragraph"> <p>When no refspec was given on the command line, then <code>git pull</code> uses the refspec from the configuration or <code>$GIT_DIR/remotes/<origin></code>. In such cases, the following rules apply:</p> </div> <div class="olist arabic"> <ol class="arabic"> <li> <p>If <code>branch.<name>.merge</code> configuration for the current branch <code><name></code> exists, that is the name of the branch at the remote site that is merged.</p> </li> <li> <p>If the refspec is a globbing one, nothing is merged.</p> </li> <li> <p>Otherwise the remote branch of the first refspec is merged.</p> </li> </ol> </div> </div> </div> <div class="sect1"> <h2 id="_examples"><a class="anchor" href="#_examples"></a>EXAMPLES</h2> <div class="sectionbody"> <div class="ulist"> <ul> <li> <p>Update the remote-tracking branches for the repository you cloned from, then merge one of them into your current branch:</p> <div class="listingblock"> <div class="content"> <pre>$ git pull, git pull origin</pre> </div> </div> <div class="paragraph"> <p>Normally the branch merged in is the HEAD of the remote repository, but the choice is determined by the branch.<name>.remote and branch.<name>.merge options; see <a href='/docs/git-config'>git-config[1]</a> for details.</p> </div> </li> <li> <p>Merge into the current branch the remote branch <code>next</code>:</p> <div class="listingblock"> <div class="content"> <pre>$ git pull origin next</pre> </div> </div> <div class="paragraph"> <p>This leaves a copy of <code>next</code> temporarily in FETCH_HEAD, but does not update any remote-tracking branches. Using remote-tracking branches, the same can be done by invoking fetch and merge:</p> </div> <div class="listingblock"> <div class="content"> <pre>$ git fetch origin $ git merge origin/next</pre> </div> </div> </li> </ul> </div> <div class="paragraph"> <p>If you tried a pull which resulted in complex conflicts and would want to start over, you can recover with <em>git reset</em>.</p> </div> </div> </div> <div class="sect1"> <h2 id="_bugs"><a class="anchor" href="#_bugs"></a>BUGS</h2> <div class="sectionbody"> <div class="paragraph"> <p>Using --recurse-submodules can only fetch new commits in already checked out submodules right now. When e.g. upstream added a new submodule in the just fetched commits of the superproject the submodule itself can not be fetched, making it impossible to check out that submodule later without having to do a fetch again. This is expected to be fixed in a future Git version.</p> </div> </div> </div> <div class="sect1"> <h2 id="_see_also"><a class="anchor" href="#_see_also"></a>SEE ALSO</h2> <div class="sectionbody"> <div class="paragraph"> <p><a href='/docs/git-fetch'>git-fetch[1]</a>, <a href='/docs/git-merge'>git-merge[1]</a>, <a href='/docs/git-config'>git-config[1]</a></p> </div> </div> </div> <div class="sect1"> <h2 id="_git"><a class="anchor" href="#_git"></a>GIT</h2> <div class="sectionbody"> <div class="paragraph"> <p>Part of the <a href='/docs/git'>git[1]</a> suite</p> </div> </div> </div> <h3 hidden="true" data-pagefind-weight="10">pull</h3> </div> </div> </div> <footer> <div class="site-source"> <a href="/site">About this site</a><br> Patches, suggestions, and comments are welcome. </div> <div class="sfc-member"> Git is a member of <a href="/sfc">Software Freedom Conservancy</a> </div> </footer> <a href="#top" class="no-js scrollToTop" id="scrollToTop" data-label="Scroll to top"> <img src="/images/icons/chevron-up@2x.png" width="20" height="20" alt="scroll-to-top"/> </a> <script src="/js/jquery-1.7.1.min.js"></script> <script src="/js/jquery-ui-1.8.18.custom.min.js"></script> <script src="/js/jquery.defaultvalue.js"></script> <script src="/js/session.min.js"></script> <script src="/js/modernizr.js"></script> <script src="/js/modernize.js"></script> <script src="/js/application.min.js"></script> </div> </body> </html>

CINXE.COM

Git - git-pull Documentation