git-pull.html

   1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   2     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
   3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
   4 <head>
   5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   6 <meta name="generator" content="AsciiDoc 8.4.5" />
   7 <title>git-pull(1)</title>
   8 <style type="text/css">
   9 /* Debug borders */
  10 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
  11 /*
  12   border: 1px solid red;
  13 */
  14 }
  15
  16 body {
  17   margin: 1em 5% 1em 5%;
  18 }
  19
  20 a {
  21   color: blue;
  22   text-decoration: underline;
  23 }
  24 a:visited {
  25   color: fuchsia;
  26 }
  27
  28 em {
  29   font-style: italic;
  30   color: navy;
  31 }
  32
  33 strong {
  34   font-weight: bold;
  35   color: #083194;
  36 }
  37
  38 tt {
  39   color: navy;
  40 }
  41
  42 h1, h2, h3, h4, h5, h6 {
  43   color: #527bbd;
  44   font-family: sans-serif;
  45   margin-top: 1.2em;
  46   margin-bottom: 0.5em;
  47   line-height: 1.3;
  48 }
  49
  50 h1, h2, h3 {
  51   border-bottom: 2px solid silver;
  52 }
  53 h2 {
  54   padding-top: 0.5em;
  55 }
  56 h3 {
  57   float: left;
  58 }
  59 h3 + * {
  60   clear: left;
  61 }
  62
  63 div.sectionbody {
  64   font-family: serif;
  65   margin-left: 0;
  66 }
  67
  68 hr {
  69   border: 1px solid silver;
  70 }
  71
  72 p {
  73   margin-top: 0.5em;
  74   margin-bottom: 0.5em;
  75 }
  76
  77 ul, ol, li > p {
  78   margin-top: 0;
  79 }
  80
  81 pre {
  82   padding: 0;
  83   margin: 0;
  84 }
  85
  86 span#author {
  87   color: #527bbd;
  88   font-family: sans-serif;
  89   font-weight: bold;
  90   font-size: 1.1em;
  91 }
  92 span#email {
  93 }
  94 span#revnumber, span#revdate, span#revremark {
  95   font-family: sans-serif;
  96 }
  97
  98 div#footer {
  99   font-family: sans-serif;
 100   font-size: small;
 101   border-top: 2px solid silver;
 102   padding-top: 0.5em;
 103   margin-top: 4.0em;
 104 }
 105 div#footer-text {
 106   float: left;
 107   padding-bottom: 0.5em;
 108 }
 109 div#footer-badges {
 110   float: right;
 111   padding-bottom: 0.5em;
 112 }
 113
 114 div#preamble {
 115   margin-top: 1.5em;
 116   margin-bottom: 1.5em;
 117 }
 118 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
 119 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
 120 div.admonitionblock {
 121   margin-top: 1.5em;
 122   margin-bottom: 1.5em;
 123 }
 124 div.admonitionblock {
 125   margin-top: 2.5em;
 126   margin-bottom: 2.5em;
 127 }
 128
 129 div.content { /* Block element content. */
 130   padding: 0;
 131 }
 132
 133 /* Block element titles. */
 134 div.title, caption.title {
 135   color: #527bbd;
 136   font-family: sans-serif;
 137   font-weight: bold;
 138   text-align: left;
 139   margin-top: 1.0em;
 140   margin-bottom: 0.5em;
 141 }
 142 div.title + * {
 143   margin-top: 0;
 144 }
 145
 146 td div.title:first-child {
 147   margin-top: 0.0em;
 148 }
 149 div.content div.title:first-child {
 150   margin-top: 0.0em;
 151 }
 152 div.content + div.title {
 153   margin-top: 0.0em;
 154 }
 155
 156 div.sidebarblock > div.content {
 157   background: #ffffee;
 158   border: 1px solid silver;
 159   padding: 0.5em;
 160 }
 161
 162 div.listingblock > div.content {
 163   border: 1px solid silver;
 164   background: #f4f4f4;
 165   padding: 0.5em;
 166 }
 167
 168 div.quoteblock {
 169   padding-left: 2.0em;
 170   margin-right: 10%;
 171 }
 172 div.quoteblock > div.attribution {
 173   padding-top: 0.5em;
 174   text-align: right;
 175 }
 176
 177 div.verseblock {
 178   padding-left: 2.0em;
 179   margin-right: 10%;
 180 }
 181 div.verseblock > div.content {
 182   white-space: pre;
 183 }
 184 div.verseblock > div.attribution {
 185   padding-top: 0.75em;
 186   text-align: left;
 187 }
 188 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
 189 div.verseblock + div.attribution {
 190   text-align: left;
 191 }
 192
 193 div.admonitionblock .icon {
 194   vertical-align: top;
 195   font-size: 1.1em;
 196   font-weight: bold;
 197   text-decoration: underline;
 198   color: #527bbd;
 199   padding-right: 0.5em;
 200 }
 201 div.admonitionblock td.content {
 202   padding-left: 0.5em;
 203   border-left: 2px solid silver;
 204 }
 205
 206 div.exampleblock > div.content {
 207   border-left: 2px solid silver;
 208   padding: 0.5em;
 209 }
 210
 211 div.imageblock div.content { padding-left: 0; }
 212 span.image img { border-style: none; }
 213 a.image:visited { color: white; }
 214
 215 dl {
 216   margin-top: 0.8em;
 217   margin-bottom: 0.8em;
 218 }
 219 dt {
 220   margin-top: 0.5em;
 221   margin-bottom: 0;
 222   font-style: normal;
 223   color: navy;
 224 }
 225 dd > *:first-child {
 226   margin-top: 0.1em;
 227 }
 228
 229 ul, ol {
 230     list-style-position: outside;
 231 }
 232 ol.arabic {
 233   list-style-type: decimal;
 234 }
 235 ol.loweralpha {
 236   list-style-type: lower-alpha;
 237 }
 238 ol.upperalpha {
 239   list-style-type: upper-alpha;
 240 }
 241 ol.lowerroman {
 242   list-style-type: lower-roman;
 243 }
 244 ol.upperroman {
 245   list-style-type: upper-roman;
 246 }
 247
 248 div.compact ul, div.compact ol,
 249 div.compact p, div.compact p,
 250 div.compact div, div.compact div {
 251   margin-top: 0.1em;
 252   margin-bottom: 0.1em;
 253 }
 254
 255 div.tableblock > table {
 256   border: 3px solid #527bbd;
 257 }
 258 thead {
 259   font-family: sans-serif;
 260   font-weight: bold;
 261 }
 262 tfoot {
 263   font-weight: bold;
 264 }
 265 td > div.verse {
 266   white-space: pre;
 267 }
 268 p.table {
 269   margin-top: 0;
 270 }
 271 /* Because the table frame attribute is overriden by CSS in most browsers. */
 272 div.tableblock > table[frame="void"] {
 273   border-style: none;
 274 }
 275 div.tableblock > table[frame="hsides"] {
 276   border-left-style: none;
 277   border-right-style: none;
 278 }
 279 div.tableblock > table[frame="vsides"] {
 280   border-top-style: none;
 281   border-bottom-style: none;
 282 }
 283
 284
 285 div.hdlist {
 286   margin-top: 0.8em;
 287   margin-bottom: 0.8em;
 288 }
 289 div.hdlist tr {
 290   padding-bottom: 15px;
 291 }
 292 dt.hdlist1.strong, td.hdlist1.strong {
 293   font-weight: bold;
 294 }
 295 td.hdlist1 {
 296   vertical-align: top;
 297   font-style: normal;
 298   padding-right: 0.8em;
 299   color: navy;
 300 }
 301 td.hdlist2 {
 302   vertical-align: top;
 303 }
 304 div.hdlist.compact tr {
 305   margin: 0;
 306   padding-bottom: 0;
 307 }
 308
 309 .comment {
 310   background: yellow;
 311 }
 312
 313 @media print {
 314   div#footer-badges { display: none; }
 315 }
 316
 317 div#toctitle {
 318   color: #527bbd;
 319   font-family: sans-serif;
 320   font-size: 1.1em;
 321   font-weight: bold;
 322   margin-top: 1.0em;
 323   margin-bottom: 0.1em;
 324 }
 325
 326 div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
 327   margin-top: 0;
 328   margin-bottom: 0;
 329 }
 330 div.toclevel2 {
 331   margin-left: 2em;
 332   font-size: 0.9em;
 333 }
 334 div.toclevel3 {
 335   margin-left: 4em;
 336   font-size: 0.9em;
 337 }
 338 div.toclevel4 {
 339   margin-left: 6em;
 340   font-size: 0.9em;
 341 }
 342 /* Overrides for manpage documents */
 343 h1 {
 344   padding-top: 0.5em;
 345   padding-bottom: 0.5em;
 346   border-top: 2px solid silver;
 347   border-bottom: 2px solid silver;
 348 }
 349 h2 {
 350   border-style: none;
 351 }
 352 div.sectionbody {
 353   margin-left: 5%;
 354 }
 355
 356 @media print {
 357   div#toc { display: none; }
 358 }
 359
 360 /* Workarounds for IE6's broken and incomplete CSS2. */
 361
 362 div.sidebar-content {
 363   background: #ffffee;
 364   border: 1px solid silver;
 365   padding: 0.5em;
 366 }
 367 div.sidebar-title, div.image-title {
 368   color: #527bbd;
 369   font-family: sans-serif;
 370   font-weight: bold;
 371   margin-top: 0.0em;
 372   margin-bottom: 0.5em;
 373 }
 374
 375 div.listingblock div.content {
 376   border: 1px solid silver;
 377   background: #f4f4f4;
 378   padding: 0.5em;
 379 }
 380
 381 div.quoteblock-attribution {
 382   padding-top: 0.5em;
 383   text-align: right;
 384 }
 385
 386 div.verseblock-content {
 387   white-space: pre;
 388 }
 389 div.verseblock-attribution {
 390   padding-top: 0.75em;
 391   text-align: left;
 392 }
 393
 394 div.exampleblock-content {
 395   border-left: 2px solid silver;
 396   padding-left: 0.5em;
 397 }
 398
 399 /* IE6 sets dynamically generated links as visited. */
 400 div#toc a:visited { color: blue; }
 401 </style>
 402 </head>
 403 <body>
 404 <div id="header">
 405 <h1>
 406 git-pull(1) Manual Page
 407 </h1>
 408 <h2>NAME</h2>
 409 <div class="sectionbody">
 410 <p>git-pull -
 411    Fetch from and merge with another repository or a local branch
 412 </p>
 413 </div>
 414 </div>
 415 <h2 id="_synopsis">SYNOPSIS</h2>
 416 <div class="sectionbody">
 417 <div class="paragraph"><p><em>git pull</em> [options] [&lt;repository&gt; [&lt;refspec&gt;&#8230;]]</p></div>
 418 </div>
 419 <h2 id="_description">DESCRIPTION</h2>
 420 <div class="sectionbody">
 421 <div class="paragraph"><p>Incorporates changes from a remote repository into the current
 422 branch.  In its default mode, <tt>git pull</tt> is shorthand for
 423 <tt>git fetch</tt> followed by <tt>git merge FETCH_HEAD</tt>.</p></div>
 424 <div class="paragraph"><p>More precisely, <em>git pull</em> runs <em>git fetch</em> with the given
 425 parameters and calls <em>git merge</em> to merge the retrieved branch
 426 heads into the current branch.
 427 With <tt>--rebase</tt>, it runs <em>git rebase</em> instead of <em>git merge</em>.</p></div>
 428 <div class="paragraph"><p>&lt;repository&gt; should be the name of a remote repository as
 429 passed to <a href="git-fetch.html">git-fetch(1)</a>.  &lt;refspec&gt; can name an
 430 arbitrary remote ref (for example, the name of a tag) or even
 431 a collection of refs with corresponding remote-tracking branches
 432 (e.g., refs/heads/&#42;:refs/remotes/origin/&#42;),
 433 but usually it is the name of a branch in the remote repository.</p></div>
 434 <div class="paragraph"><p>Default values for &lt;repository&gt; and &lt;branch&gt; are read from the
 435 "remote" and "merge" configuration for the current branch
 436 as set by <a href="git-branch.html">git-branch(1)</a> <tt>--track</tt>.</p></div>
 437 <div class="paragraph"><p>Assume the following history exists and the current branch is
 438 "<tt>master</tt>":</p></div>
 439 <div class="listingblock">
 440 <div class="content">
 441 <pre><tt>          A---B---C master on origin
 442          /
 443     D---E---F---G master</tt></pre>
 444 </div></div>
 445 <div class="paragraph"><p>Then "<tt>git pull</tt>" will fetch and replay the changes from the remote
 446 <tt>master</tt> branch since it diverged from the local <tt>master</tt> (i.e., <tt>E</tt>)
 447 until its current commit (<tt>C</tt>) on top of <tt>master</tt> and record the
 448 result in a new commit along with the names of the two parent commits
 449 and a log message from the user describing the changes.</p></div>
 450 <div class="listingblock">
 451 <div class="content">
 452 <pre><tt>          A---B---C remotes/origin/master
 453          /         \
 454     D---E---F---G---H master</tt></pre>
 455 </div></div>
 456 <div class="paragraph"><p>See <a href="git-merge.html">git-merge(1)</a> for details, including how conflicts
 457 are presented and handled.</p></div>
 458 <div class="paragraph"><p>In git 1.7.0 or later, to cancel a conflicting merge, use
 459 <tt>git reset --merge</tt>.  <strong>Warning</strong>: In older versions of git, running <em>git pull</em>
 460 with uncommitted changes is discouraged: while possible, it leaves you
 461 in a state that may be hard to back out of in the case of a conflict.</p></div>
 462 <div class="paragraph"><p>If any of the remote changes overlap with local uncommitted changes,
 463 the merge will be automatically cancelled and the work tree untouched.
 464 It is generally best to get any local changes in working order before
 465 pulling or stash them away with <a href="git-stash.html">git-stash(1)</a>.</p></div>
 466 </div>
 467 <h2 id="_options">OPTIONS</h2>
 468 <div class="sectionbody">
 469 <div class="paragraph"><p>Options meant for <em>git pull</em> itself and the underlying <em>git merge</em>
 470 must be given before the options meant for <em>git fetch</em>.</p></div>
 471 <div class="dlist"><dl>
 472 <dt class="hdlist1">
 473 -q
 474 </dt>
 475 <dt class="hdlist1">
 476 --quiet
 477 </dt>
 478 <dd>
 479 <p>
 480         This is passed to both underlying git-fetch to squelch reporting of
 481         during transfer, and underlying git-merge to squelch output during
 482         merging.
 483 </p>
 484 </dd>
 485 <dt class="hdlist1">
 486 -v
 487 </dt>
 488 <dt class="hdlist1">
 489 --verbose
 490 </dt>
 491 <dd>
 492 <p>
 493         Pass --verbose to git-fetch and git-merge.
 494 </p>
 495 </dd>
 496 </dl></div>
 497 <h3 id="_options_related_to_merging">Options related to merging</h3><div style="clear:left"></div>
 498 <div class="dlist"><dl>
 499 <dt class="hdlist1">
 500 --commit
 501 </dt>
 502 <dt class="hdlist1">
 503 --no-commit
 504 </dt>
 505 <dd>
 506 <p>
 507         Perform the merge and commit the result. This option can
 508         be used to override --no-commit.
 509 </p>
 510 <div class="paragraph"><p>With --no-commit perform the merge but pretend the merge
 511 failed and do not autocommit, to give the user a chance to
 512 inspect and further tweak the merge result before committing.</p></div>
 513 </dd>
 514 <dt class="hdlist1">
 515 --ff
 516 </dt>
 517 <dt class="hdlist1">
 518 --no-ff
 519 </dt>
 520 <dd>
 521 <p>
 522         Do not generate a merge commit if the merge resolved as
 523         a fast-forward, only update the branch pointer. This is
 524         the default behavior of git-merge.
 525 </p>
 526 <div class="paragraph"><p>With --no-ff Generate a merge commit even if the merge
 527 resolved as a fast-forward.</p></div>
 528 </dd>
 529 <dt class="hdlist1">
 530 --log[=&lt;n&gt;]
 531 </dt>
 532 <dt class="hdlist1">
 533 --no-log
 534 </dt>
 535 <dd>
 536 <p>
 537         In addition to branch names, populate the log message with
 538         one-line descriptions from at most &lt;n&gt; actual commits that are being
 539         merged. See also <a href="git-fmt-merge-msg.html">git-fmt-merge-msg(1)</a>.
 540 </p>
 541 <div class="paragraph"><p>With --no-log do not list one-line descriptions from the
 542 actual commits being merged.</p></div>
 543 </dd>
 544 <dt class="hdlist1">
 545 --stat
 546 </dt>
 547 <dt class="hdlist1">
 548 -n
 549 </dt>
 550 <dt class="hdlist1">
 551 --no-stat
 552 </dt>
 553 <dd>
 554 <p>
 555         Show a diffstat at the end of the merge. The diffstat is also
 556         controlled by the configuration option merge.stat.
 557 </p>
 558 <div class="paragraph"><p>With -n or --no-stat do not show a diffstat at the end of the
 559 merge.</p></div>
 560 </dd>
 561 <dt class="hdlist1">
 562 --squash
 563 </dt>
 564 <dt class="hdlist1">
 565 --no-squash
 566 </dt>
 567 <dd>
 568 <p>
 569         Produce the working tree and index state as if a real
 570         merge happened (except for the merge information),
 571         but do not actually make a commit or
 572         move the <tt>HEAD</tt>, nor record <tt>$GIT_DIR/MERGE_HEAD</tt> to
 573         cause the next <tt>git commit</tt> command to create a merge
 574         commit.  This allows you to create a single commit on
 575         top of the current branch whose effect is the same as
 576         merging another branch (or more in case of an octopus).
 577 </p>
 578 <div class="paragraph"><p>With --no-squash perform the merge and commit the result. This
 579 option can be used to override --squash.</p></div>
 580 </dd>
 581 <dt class="hdlist1">
 582 --ff-only
 583 </dt>
 584 <dd>
 585 <p>
 586         Refuse to merge and exit with a non-zero status unless the
 587         current <tt>HEAD</tt> is already up-to-date or the merge can be
 588         resolved as a fast-forward.
 589 </p>
 590 </dd>
 591 <dt class="hdlist1">
 592 -s &lt;strategy&gt;
 593 </dt>
 594 <dt class="hdlist1">
 595 --strategy=&lt;strategy&gt;
 596 </dt>
 597 <dd>
 598 <p>
 599         Use the given merge strategy; can be supplied more than
 600         once to specify them in the order they should be tried.
 601         If there is no <tt>-s</tt> option, a built-in list of strategies
 602         is used instead (<em>git merge-recursive</em> when merging a single
 603         head, <em>git merge-octopus</em> otherwise).
 604 </p>
 605 </dd>
 606 <dt class="hdlist1">
 607 -X &lt;option&gt;
 608 </dt>
 609 <dt class="hdlist1">
 610 --strategy-option=&lt;option&gt;
 611 </dt>
 612 <dd>
 613 <p>
 614         Pass merge strategy specific option through to the merge
 615         strategy.
 616 </p>
 617 </dd>
 618 <dt class="hdlist1">
 619 --summary
 620 </dt>
 621 <dt class="hdlist1">
 622 --no-summary
 623 </dt>
 624 <dd>
 625 <p>
 626         Synonyms to --stat and --no-stat; these are deprecated and will be
 627         removed in the future.
 628 </p>
 629 </dd>
 630 <dt class="hdlist1">
 631 -q
 632 </dt>
 633 <dt class="hdlist1">
 634 --quiet
 635 </dt>
 636 <dd>
 637 <p>
 638         Operate quietly.
 639 </p>
 640 </dd>
 641 <dt class="hdlist1">
 642 -v
 643 </dt>
 644 <dt class="hdlist1">
 645 --verbose
 646 </dt>
 647 <dd>
 648 <p>
 649         Be verbose.
 650 </p>
 651 </dd>
 652 </dl></div>
 653 <div class="dlist"><dl>
 654 <dt class="hdlist1">
 655 --rebase
 656 </dt>
 657 <dd>
 658 <p>
 659         Rebase the current branch on top of the upstream branch after
 660         fetching.  If there is a remote-tracking branch corresponding to
 661         the upstream branch and the upstream branch was rebased since last
 662         fetched, the rebase uses that information to avoid rebasing
 663         non-local changes.
 664 </p>
 665 <div class="paragraph"><p>See <tt>branch.&lt;name&gt;.rebase</tt> and <tt>branch.autosetuprebase</tt> in
 666 <a href="git-config.html">git-config(1)</a> if you want to make <tt>git pull</tt> always use
 667 <tt>&#45;&#45;rebase</tt> instead of merging.</p></div>
 668 <div class="admonitionblock">
 669 <table><tr>
 670 <td class="icon">
 671 <div class="title">Note</div>
 672 </td>
 673 <td class="content">This is a potentially <em>dangerous</em> mode of operation.
 674 It rewrites history, which does not bode well when you
 675 published that history already.  Do <strong>not</strong> use this option
 676 unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</td>
 677 </tr></table>
 678 </div>
 679 </dd>
 680 <dt class="hdlist1">
 681 --no-rebase
 682 </dt>
 683 <dd>
 684 <p>
 685         Override earlier --rebase.
 686 </p>
 687 </dd>
 688 </dl></div>
 689 <h3 id="_options_related_to_fetching">Options related to fetching</h3><div style="clear:left"></div>
 690 <div class="dlist"><dl>
 691 <dt class="hdlist1">
 692 --all
 693 </dt>
 694 <dd>
 695 <p>
 696         Fetch all remotes.
 697 </p>
 698 </dd>
 699 <dt class="hdlist1">
 700 -a
 701 </dt>
 702 <dt class="hdlist1">
 703 --append
 704 </dt>
 705 <dd>
 706 <p>
 707         Append ref names and object names of fetched refs to the
 708         existing contents of <tt>.git/FETCH_HEAD</tt>.  Without this
 709         option old data in <tt>.git/FETCH_HEAD</tt> will be overwritten.
 710 </p>
 711 </dd>
 712 <dt class="hdlist1">
 713 --depth=&lt;depth&gt;
 714 </dt>
 715 <dd>
 716 <p>
 717         Deepen the history of a <em>shallow</em> repository created by
 718         <tt>git clone</tt> with <tt>--depth=&lt;depth&gt;</tt> option (see <a href="git-clone.html">git-clone(1)</a>)
 719         by the specified number of commits.
 720 </p>
 721 </dd>
 722 <dt class="hdlist1">
 723 -f
 724 </dt>
 725 <dt class="hdlist1">
 726 --force
 727 </dt>
 728 <dd>
 729 <p>
 730         When <em>git fetch</em> is used with <tt>&lt;rbranch&gt;:&lt;lbranch&gt;</tt>
 731         refspec, it refuses to update the local branch
 732         <tt>&lt;lbranch&gt;</tt> unless the remote branch <tt>&lt;rbranch&gt;</tt> it
 733         fetches is a descendant of <tt>&lt;lbranch&gt;</tt>.  This option
 734         overrides that check.
 735 </p>
 736 </dd>
 737 <dt class="hdlist1">
 738 -k
 739 </dt>
 740 <dt class="hdlist1">
 741 --keep
 742 </dt>
 743 <dd>
 744 <p>
 745         Keep downloaded pack.
 746 </p>
 747 </dd>
 748 <dt class="hdlist1">
 749 --no-tags
 750 </dt>
 751 <dd>
 752 <p>
 753         By default, tags that point at objects that are downloaded
 754         from the remote repository are fetched and stored locally.
 755         This option disables this automatic tag following. The default
 756         behavior for a remote may be specified with the remote.&lt;name&gt;.tagopt
 757         setting. See <a href="git-config.html">git-config(1)</a>.
 758 </p>
 759 </dd>
 760 <dt class="hdlist1">
 761 --[no-]recurse-submodules
 762 </dt>
 763 <dd>
 764 <p>
 765         This option controls if new commits of all populated submodules should
 766         be fetched too (see <a href="git-config.html">git-config(1)</a> and <a href="gitmodules.html">gitmodules(5)</a>).
 767 </p>
 768 </dd>
 769 <dt class="hdlist1">
 770 -u
 771 </dt>
 772 <dt class="hdlist1">
 773 --update-head-ok
 774 </dt>
 775 <dd>
 776 <p>
 777         By default <em>git fetch</em> refuses to update the head which
 778         corresponds to the current branch.  This flag disables the
 779         check.  This is purely for the internal use for <em>git pull</em>
 780         to communicate with <em>git fetch</em>, and unless you are
 781         implementing your own Porcelain you are not supposed to
 782         use it.
 783 </p>
 784 </dd>
 785 <dt class="hdlist1">
 786 --upload-pack &lt;upload-pack&gt;
 787 </dt>
 788 <dd>
 789 <p>
 790         When given, and the repository to fetch from is handled
 791         by <em>git fetch-pack</em>, <em>--exec=&lt;upload-pack&gt;</em> is passed to
 792         the command to specify non-default path for the command
 793         run on the other end.
 794 </p>
 795 </dd>
 796 <dt class="hdlist1">
 797 --progress
 798 </dt>
 799 <dd>
 800 <p>
 801         Progress status is reported on the standard error stream
 802         by default when it is attached to a terminal, unless -q
 803         is specified. This flag forces progress status even if the
 804         standard error stream is not directed to a terminal.
 805 </p>
 806 </dd>
 807 <dt class="hdlist1">
 808 &lt;repository&gt;
 809 </dt>
 810 <dd>
 811 <p>
 812         The "remote" repository that is the source of a fetch
 813         or pull operation.  This parameter can be either a URL
 814         (see the section <a href="#URLS">GIT URLS</a> below) or the name
 815         of a remote (see the section <a href="#REMOTES">REMOTES</a> below).
 816 </p>
 817 </dd>
 818 <dt class="hdlist1">
 819 &lt;refspec&gt;
 820 </dt>
 821 <dd>
 822 <p>
 823         The format of a &lt;refspec&gt; parameter is an optional plus
 824         <tt>&#43;</tt>, followed by the source ref &lt;src&gt;, followed
 825         by a colon <tt>:</tt>, followed by the destination ref &lt;dst&gt;.
 826 </p>
 827 <div class="paragraph"><p>The remote ref that matches &lt;src&gt;
 828 is fetched, and if &lt;dst&gt; is not empty string, the local
 829 ref that matches it is fast-forwarded using &lt;src&gt;.
 830 If the optional plus <tt>+</tt> is used, the local ref
 831 is updated even if it does not result in a fast-forward
 832 update.</p></div>
 833 <div class="admonitionblock">
 834 <table><tr>
 835 <td class="icon">
 836 <div class="title">Note</div>
 837 </td>
 838 <td class="content">If the remote branch from which you want to pull is
 839 modified in non-linear ways such as being rewound and
 840 rebased frequently, then a pull will attempt a merge with
 841 an older version of itself, likely conflict, and fail.
 842 It is under these conditions that you would want to use
 843 the <tt>+</tt> sign to indicate non-fast-forward updates will
 844 be needed.  There is currently no easy way to determine
 845 or declare that a branch will be made available in a
 846 repository with this behavior; the pulling user simply
 847 must know this is the expected usage pattern for a branch.</td>
 848 </tr></table>
 849 </div>
 850 <div class="admonitionblock">
 851 <table><tr>
 852 <td class="icon">
 853 <div class="title">Note</div>
 854 </td>
 855 <td class="content">You never do your own development on branches that appear
 856 on the right hand side of a &lt;refspec&gt; colon on <tt>Pull:</tt> lines;
 857 they are to be updated by <em>git fetch</em>.  If you intend to do
 858 development derived from a remote branch <tt>B</tt>, have a <tt>Pull:</tt>
 859 line to track it (i.e. <tt>Pull: B:remote-B</tt>), and have a separate
 860 branch <tt>my-B</tt> to do your development on top of it.  The latter
 861 is created by <tt>git branch my-B remote-B</tt> (or its equivalent <tt>git
 862 checkout -b my-B remote-B</tt>).  Run <tt>git fetch</tt> to keep track of
 863 the progress of the remote side, and when you see something new
 864 on the remote branch, merge it into your development branch with
 865 <tt>git pull . remote-B</tt>, while you are on <tt>my-B</tt> branch.</td>
 866 </tr></table>
 867 </div>
 868 <div class="admonitionblock">
 869 <table><tr>
 870 <td class="icon">
 871 <div class="title">Note</div>
 872 </td>
 873 <td class="content">There is a difference between listing multiple &lt;refspec&gt;
 874 directly on <em>git pull</em> command line and having multiple
 875 <tt>Pull:</tt> &lt;refspec&gt; lines for a &lt;repository&gt; and running
 876 <em>git pull</em> command without any explicit &lt;refspec&gt; parameters.
 877 &lt;refspec&gt; listed explicitly on the command line are always
 878 merged into the current branch after fetching.  In other words,
 879 if you list more than one remote refs, you would be making
 880 an Octopus.  While <em>git pull</em> run without any explicit &lt;refspec&gt;
 881 parameter takes default &lt;refspec&gt;s from <tt>Pull:</tt> lines, it
 882 merges only the first &lt;refspec&gt; found into the current branch,
 883 after fetching all the remote refs.  This is because making an
 884 Octopus from remote refs is rarely done, while keeping track
 885 of multiple remote heads in one-go by fetching more than one
 886 is often useful.</td>
 887 </tr></table>
 888 </div>
 889 <div class="paragraph"><p>Some short-cut notations are also supported.</p></div>
 890 <div class="ulist"><ul>
 891 <li>
 892 <p>
 893 <tt>tag &lt;tag&gt;</tt> means the same as <tt>refs/tags/&lt;tag&gt;:refs/tags/&lt;tag&gt;</tt>;
 894   it requests fetching everything up to the given tag.
 895 </p>
 896 </li>
 897 <li>
 898 <p>
 899 A parameter &lt;ref&gt; without a colon is equivalent to
 900   &lt;ref&gt;: when pulling/fetching, so it merges &lt;ref&gt; into the current
 901   branch without storing the remote branch anywhere locally
 902 </p>
 903 </li>
 904 </ul></div>
 905 </dd>
 906 </dl></div>
 907 </div>
 908 <h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2>
 909 <div class="sectionbody">
 910 <div class="paragraph"><p>In general, URLs contain information about the transport protocol, the
 911 address of the remote server, and the path to the repository.
 912 Depending on the transport protocol, some of this information may be
 913 absent.</p></div>
 914 <div class="paragraph"><p>Git natively supports ssh, git, http, https, ftp, ftps, and rsync
 915 protocols. The following syntaxes may be used with them:</p></div>
 916 <div class="ulist"><ul>
 917 <li>
 918 <p>
 919 ssh://&#91;user@&#93;host.xz&#91;:port&#93;/path/to/repo.git/
 920 </p>
 921 </li>
 922 <li>
 923 <p>
 924 git://host.xz&#91;:port&#93;/path/to/repo.git/
 925 </p>
 926 </li>
 927 <li>
 928 <p>
 929 http&#91;s&#93;://host.xz&#91;:port&#93;/path/to/repo.git/
 930 </p>
 931 </li>
 932 <li>
 933 <p>
 934 ftp&#91;s&#93;://host.xz&#91;:port&#93;/path/to/repo.git/
 935 </p>
 936 </li>
 937 <li>
 938 <p>
 939 rsync://host.xz/path/to/repo.git/
 940 </p>
 941 </li>
 942 </ul></div>
 943 <div class="paragraph"><p>An alternative scp-like syntax may also be used with the ssh protocol:</p></div>
 944 <div class="ulist"><ul>
 945 <li>
 946 <p>
 947 &#91;user@&#93;host.xz:path/to/repo.git/
 948 </p>
 949 </li>
 950 </ul></div>
 951 <div class="paragraph"><p>The ssh and git protocols additionally support ~username expansion:</p></div>
 952 <div class="ulist"><ul>
 953 <li>
 954 <p>
 955 ssh://&#91;user@&#93;host.xz&#91;:port&#93;/~&#91;user&#93;/path/to/repo.git/
 956 </p>
 957 </li>
 958 <li>
 959 <p>
 960 git://host.xz&#91;:port&#93;/~&#91;user&#93;/path/to/repo.git/
 961 </p>
 962 </li>
 963 <li>
 964 <p>
 965 &#91;user@&#93;host.xz:/~&#91;user&#93;/path/to/repo.git/
 966 </p>
 967 </li>
 968 </ul></div>
 969 <div class="paragraph"><p>For local repositories, also supported by git natively, the following
 970 syntaxes may be used:</p></div>
 971 <div class="ulist"><ul>
 972 <li>
 973 <p>
 974 /path/to/repo.git/
 975 </p>
 976 </li>
 977 <li>
 978 <p>
 979 <a href="file:///path/to/repo.git/">file:///path/to/repo.git/</a>
 980 </p>
 981 </li>
 982 </ul></div>
 983 <div class="paragraph"><p>These two syntaxes are mostly equivalent, except when cloning, when
 984 the former implies --local option. See <a href="git-clone.html">git-clone(1)</a> for
 985 details.</p></div>
 986 <div class="paragraph"><p>When git doesn&#8217;t know how to handle a certain transport protocol, it
 987 attempts to use the <em>remote-&lt;transport&gt;</em> remote helper, if one
 988 exists. To explicitly request a remote helper, the following syntax
 989 may be used:</p></div>
 990 <div class="ulist"><ul>
 991 <li>
 992 <p>
 993 &lt;transport&gt;::&lt;address&gt;
 994 </p>
 995 </li>
 996 </ul></div>
 997 <div class="paragraph"><p>where &lt;address&gt; may be a path, a server and path, or an arbitrary
 998 URL-like string recognized by the specific remote helper being
 999 invoked. See <a href="git-remote-helpers.html">git-remote-helpers(1)</a> for details.</p></div>
1000 <div class="paragraph"><p>If there are a large number of similarly-named remote repositories and
1001 you want to use a different format for them (such that the URLs you
1002 use will be rewritten into URLs that work), you can create a
1003 configuration section of the form:</p></div>
1004 <div class="listingblock">
1005 <div class="content">
1006 <pre><tt>        [url "&lt;actual url base&gt;"]
1007                 insteadOf = &lt;other url base&gt;</tt></pre>
1008 </div></div>
1009 <div class="paragraph"><p>For example, with this:</p></div>
1010 <div class="listingblock">
1011 <div class="content">
1012 <pre><tt>        [url "git://git.host.xz/"]
1013                 insteadOf = host.xz:/path/to/
1014                 insteadOf = work:</tt></pre>
1015 </div></div>
1016 <div class="paragraph"><p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be
1017 rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p></div>
1018 <div class="paragraph"><p>If you want to rewrite URLs for push only, you can create a
1019 configuration section of the form:</p></div>
1020 <div class="listingblock">
1021 <div class="content">
1022 <pre><tt>        [url "&lt;actual url base&gt;"]
1023                 pushInsteadOf = &lt;other url base&gt;</tt></pre>
1024 </div></div>
1025 <div class="paragraph"><p>For example, with this:</p></div>
1026 <div class="listingblock">
1027 <div class="content">
1028 <pre><tt>        [url "ssh://example.org/"]
1029                 pushInsteadOf = git://example.org/</tt></pre>
1030 </div></div>
1031 <div class="paragraph"><p>a URL like "git://example.org/path/to/repo.git" will be rewritten to
1032 "ssh://example.org/path/to/repo.git" for pushes, but pulls will still
1033 use the original URL.</p></div>
1034 </div>
1035 <h2 id="_remotes_a_id_remotes_a">REMOTES<a id="REMOTES"></a></h2>
1036 <div class="sectionbody">
1037 <div class="paragraph"><p>The name of one of the following can be used instead
1038 of a URL as <tt>&lt;repository&gt;</tt> argument:</p></div>
1039 <div class="ulist"><ul>
1040 <li>
1041 <p>
1042 a remote in the git configuration file: <tt>$GIT_DIR/config</tt>,
1043 </p>
1044 </li>
1045 <li>
1046 <p>
1047 a file in the <tt>$GIT_DIR/remotes</tt> directory, or
1048 </p>
1049 </li>
1050 <li>
1051 <p>
1052 a file in the <tt>$GIT_DIR/branches</tt> directory.
1053 </p>
1054 </li>
1055 </ul></div>
1056 <div class="paragraph"><p>All of these also allow you to omit the refspec from the command line
1057 because they each contain a refspec which git will use by default.</p></div>
1058 <h3 id="_named_remote_in_configuration_file">Named remote in configuration file</h3><div style="clear:left"></div>
1059 <div class="paragraph"><p>You can choose to provide the name of a remote which you had previously
1060 configured using <a href="git-remote.html">git-remote(1)</a>, <a href="git-config.html">git-config(1)</a>
1061 or even by a manual edit to the <tt>$GIT_DIR/config</tt> file.  The URL of
1062 this remote will be used to access the repository.  The refspec
1063 of this remote will be used by default when you do
1064 not provide a refspec on the command line.  The entry in the
1065 config file would appear like this:</p></div>
1066 <div class="listingblock">
1067 <div class="content">
1068 <pre><tt>        [remote "&lt;name&gt;"]
1069                 url = &lt;url&gt;
1070                 pushurl = &lt;pushurl&gt;
1071                 push = &lt;refspec&gt;
1072                 fetch = &lt;refspec&gt;</tt></pre>
1073 </div></div>
1074 <div class="paragraph"><p>The <tt>&lt;pushurl&gt;</tt> is used for pushes only. It is optional and defaults
1075 to <tt>&lt;url&gt;</tt>.</p></div>
1076 <h3 id="_named_file_in_tt_git_dir_remotes_tt">Named file in <tt>$GIT_DIR/remotes</tt></h3><div style="clear:left"></div>
1077 <div class="paragraph"><p>You can choose to provide the name of a
1078 file in <tt>$GIT_DIR/remotes</tt>.  The URL
1079 in this file will be used to access the repository.  The refspec
1080 in this file will be used as default when you do not
1081 provide a refspec on the command line.  This file should have the
1082 following format:</p></div>
1083 <div class="listingblock">
1084 <div class="content">
1085 <pre><tt>        URL: one of the above URL format
1086         Push: &lt;refspec&gt;
1087         Pull: &lt;refspec&gt;</tt></pre>
1088 </div></div>
1089 <div class="paragraph"><p><tt>Push:</tt> lines are used by <em>git push</em> and
1090 <tt>Pull:</tt> lines are used by <em>git pull</em> and <em>git fetch</em>.
1091 Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may
1092 be specified for additional branch mappings.</p></div>
1093 <h3 id="_named_file_in_tt_git_dir_branches_tt">Named file in <tt>$GIT_DIR/branches</tt></h3><div style="clear:left"></div>
1094 <div class="paragraph"><p>You can choose to provide the name of a
1095 file in <tt>$GIT_DIR/branches</tt>.
1096 The URL in this file will be used to access the repository.
1097 This file should have the following format:</p></div>
1098 <div class="listingblock">
1099 <div class="content">
1100 <pre><tt>        &lt;url&gt;#&lt;head&gt;</tt></pre>
1101 </div></div>
1102 <div class="paragraph"><p><tt>&lt;url&gt;</tt> is required; <tt>#&lt;head&gt;</tt> is optional.</p></div>
1103 <div class="paragraph"><p>Depending on the operation, git will use one of the following
1104 refspecs, if you don&#8217;t provide one on the command line.
1105 <tt>&lt;branch&gt;</tt> is the name of this file in <tt>$GIT_DIR/branches</tt> and
1106 <tt>&lt;head&gt;</tt> defaults to <tt>master</tt>.</p></div>
1107 <div class="paragraph"><p>git fetch uses:</p></div>
1108 <div class="listingblock">
1109 <div class="content">
1110 <pre><tt>        refs/heads/&lt;head&gt;:refs/heads/&lt;branch&gt;</tt></pre>
1111 </div></div>
1112 <div class="paragraph"><p>git push uses:</p></div>
1113 <div class="listingblock">
1114 <div class="content">
1115 <pre><tt>        HEAD:refs/heads/&lt;head&gt;</tt></pre>
1116 </div></div>
1117 </div>
1118 <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
1119 <div class="sectionbody">
1120 <div class="paragraph"><p>The merge mechanism (<em>git-merge</em> and <em>git-pull</em> commands) allows the
1121 backend <em>merge strategies</em> to be chosen with <tt>-s</tt> option.  Some strategies
1122 can also take their own options, which can be passed by giving <tt>-X&lt;option&gt;</tt>
1123 arguments to <em>git-merge</em> and/or <em>git-pull</em>.</p></div>
1124 <div class="dlist"><dl>
1125 <dt class="hdlist1">
1126 resolve
1127 </dt>
1128 <dd>
1129 <p>
1130         This can only resolve two heads (i.e. the current branch
1131         and another branch you pulled from) using a 3-way merge
1132         algorithm.  It tries to carefully detect criss-cross
1133         merge ambiguities and is considered generally safe and
1134         fast.
1135 </p>
1136 </dd>
1137 <dt class="hdlist1">
1138 recursive
1139 </dt>
1140 <dd>
1141 <p>
1142         This can only resolve two heads using a 3-way merge
1143         algorithm.  When there is more than one common
1144         ancestor that can be used for 3-way merge, it creates a
1145         merged tree of the common ancestors and uses that as
1146         the reference tree for the 3-way merge.  This has been
1147         reported to result in fewer merge conflicts without
1148         causing mis-merges by tests done on actual merge commits
1149         taken from Linux 2.6 kernel development history.
1150         Additionally this can detect and handle merges involving
1151         renames.  This is the default merge strategy when
1152         pulling or merging one branch.
1153 </p>
1154 <div class="paragraph"><p>The <em>recursive</em> strategy can take the following options:</p></div>
1155 <div class="dlist"><dl>
1156 <dt class="hdlist1">
1157 ours
1158 </dt>
1159 <dd>
1160 <p>
1161         This option forces conflicting hunks to be auto-resolved cleanly by
1162         favoring <em>our</em> version.  Changes from the other tree that do not
1163         conflict with our side are reflected to the merge result.
1164 </p>
1165 <div class="paragraph"><p>This should not be confused with the <em>ours</em> merge strategy, which does not
1166 even look at what the other tree contains at all.  It discards everything
1167 the other tree did, declaring <em>our</em> history contains all that happened in it.</p></div>
1168 </dd>
1169 <dt class="hdlist1">
1170 theirs
1171 </dt>
1172 <dd>
1173 <p>
1174         This is opposite of <em>ours</em>.
1175 </p>
1176 </dd>
1177 <dt class="hdlist1">
1178 patience
1179 </dt>
1180 <dd>
1181 <p>
1182         With this option, <em>merge-recursive</em> spends a little extra time
1183         to avoid mismerges that sometimes occur due to unimportant
1184         matching lines (e.g., braces from distinct functions).  Use
1185         this when the branches to be merged have diverged wildly.
1186         See also <a href="git-diff.html">git-diff(1)</a> <tt>--patience</tt>.
1187 </p>
1188 </dd>
1189 <dt class="hdlist1">
1190 ignore-space-change
1191 </dt>
1192 <dt class="hdlist1">
1193 ignore-all-space
1194 </dt>
1195 <dt class="hdlist1">
1196 ignore-space-at-eol
1197 </dt>
1198 <dd>
1199 <p>
1200         Treats lines with the indicated type of whitespace change as
1201         unchanged for the sake of a three-way merge.  Whitespace
1202         changes mixed with other changes to a line are not ignored.
1203         See also <a href="git-diff.html">git-diff(1)</a> <tt>-b</tt>, <tt>-w</tt>, and
1204         <tt>--ignore-space-at-eol</tt>.
1205 </p>
1206 <div class="ulist"><ul>
1207 <li>
1208 <p>
1209 If <em>their</em> version only introduces whitespace changes to a line,
1210   <em>our</em> version is used;
1211 </p>
1212 </li>
1213 <li>
1214 <p>
1215 If <em>our</em> version introduces whitespace changes but <em>their</em>
1216   version includes a substantial change, <em>their</em> version is used;
1217 </p>
1218 </li>
1219 <li>
1220 <p>
1221 Otherwise, the merge proceeds in the usual way.
1222 </p>
1223 </li>
1224 </ul></div>
1225 </dd>
1226 <dt class="hdlist1">
1227 renormalize
1228 </dt>
1229 <dd>
1230 <p>
1231         This runs a virtual check-out and check-in of all three stages
1232         of a file when resolving a three-way merge.  This option is
1233         meant to be used when merging branches with different clean
1234         filters or end-of-line normalization rules.  See "Merging
1235         branches with differing checkin/checkout attributes" in
1236         <a href="gitattributes.html">gitattributes(5)</a> for details.
1237 </p>
1238 </dd>
1239 <dt class="hdlist1">
1240 no-renormalize
1241 </dt>
1242 <dd>
1243 <p>
1244         Disables the <tt>renormalize</tt> option.  This overrides the
1245         <tt>merge.renormalize</tt> configuration variable.
1246 </p>
1247 </dd>
1248 <dt class="hdlist1">
1249 rename-threshold=&lt;n&gt;
1250 </dt>
1251 <dd>
1252 <p>
1253         Controls the similarity threshold used for rename detection.
1254         See also <a href="git-diff.html">git-diff(1)</a> <tt>-M</tt>.
1255 </p>
1256 </dd>
1257 <dt class="hdlist1">
1258 subtree[=&lt;path&gt;]
1259 </dt>
1260 <dd>
1261 <p>
1262         This option is a more advanced form of <em>subtree</em> strategy, where
1263         the strategy makes a guess on how two trees must be shifted to
1264         match with each other when merging.  Instead, the specified path
1265         is prefixed (or stripped from the beginning) to make the shape of
1266         two trees to match.
1267 </p>
1268 </dd>
1269 </dl></div>
1270 </dd>
1271 <dt class="hdlist1">
1272 octopus
1273 </dt>
1274 <dd>
1275 <p>
1276         This resolves cases with more than two heads, but refuses to do
1277         a complex merge that needs manual resolution.  It is
1278         primarily meant to be used for bundling topic branch
1279         heads together.  This is the default merge strategy when
1280         pulling or merging more than one branch.
1281 </p>
1282 </dd>
1283 <dt class="hdlist1">
1284 ours
1285 </dt>
1286 <dd>
1287 <p>
1288         This resolves any number of heads, but the resulting tree of the
1289         merge is always that of the current branch head, effectively
1290         ignoring all changes from all other branches.  It is meant to
1291         be used to supersede old development history of side
1292         branches.  Note that this is different from the -Xours option to
1293         the <em>recursive</em> merge strategy.
1294 </p>
1295 </dd>
1296 <dt class="hdlist1">
1297 subtree
1298 </dt>
1299 <dd>
1300 <p>
1301         This is a modified recursive strategy. When merging trees A and
1302         B, if B corresponds to a subtree of A, B is first adjusted to
1303         match the tree structure of A, instead of reading the trees at
1304         the same level. This adjustment is also done to the common
1305         ancestor tree.
1306 </p>
1307 </dd>
1308 </dl></div>
1309 </div>
1310 <h2 id="_default_behaviour">DEFAULT BEHAVIOUR</h2>
1311 <div class="sectionbody">
1312 <div class="paragraph"><p>Often people use <tt>git pull</tt> without giving any parameter.
1313 Traditionally, this has been equivalent to saying <tt>git pull
1314 origin</tt>.  However, when configuration <tt>branch.&lt;name&gt;.remote</tt> is
1315 present while on branch <tt>&lt;name&gt;</tt>, that value is used instead of
1316 <tt>origin</tt>.</p></div>
1317 <div class="paragraph"><p>In order to determine what URL to use to fetch from, the value
1318 of the configuration <tt>remote.&lt;origin&gt;.url</tt> is consulted
1319 and if there is not any such variable, the value on <tt>URL: ` line
1320 in `$GIT_DIR/remotes/&lt;origin&gt;</tt> file is used.</p></div>
1321 <div class="paragraph"><p>In order to determine what remote branches to fetch (and
1322 optionally store in the remote-tracking branches) when the command is
1323 run without any refspec parameters on the command line, values
1324 of the configuration variable <tt>remote.&lt;origin&gt;.fetch</tt> are
1325 consulted, and if there aren&#8217;t any, <tt>$GIT_DIR/remotes/&lt;origin&gt;</tt>
1326 file is consulted and its `Pull: ` lines are used.
1327 In addition to the refspec formats described in the OPTIONS
1328 section, you can have a globbing refspec that looks like this:</p></div>
1329 <div class="listingblock">
1330 <div class="content">
1331 <pre><tt>refs/heads/*:refs/remotes/origin/*</tt></pre>
1332 </div></div>
1333 <div class="paragraph"><p>A globbing refspec must have a non-empty RHS (i.e. must store
1334 what were fetched in remote-tracking branches), and its LHS and RHS
1335 must end with <tt>/*</tt>.  The above specifies that all remote
1336 branches are tracked using remote-tracking branches in
1337 <tt>refs/remotes/origin/</tt> hierarchy under the same name.</p></div>
1338 <div class="paragraph"><p>The rule to determine which remote branch to merge after
1339 fetching is a bit involved, in order not to break backward
1340 compatibility.</p></div>
1341 <div class="paragraph"><p>If explicit refspecs were given on the command
1342 line of <tt>git pull</tt>, they are all merged.</p></div>
1343 <div class="paragraph"><p>When no refspec was given on the command line, then <tt>git pull</tt>
1344 uses the refspec from the configuration or
1345 <tt>$GIT_DIR/remotes/&lt;origin&gt;</tt>.  In such cases, the following
1346 rules apply:</p></div>
1347 <div class="olist arabic"><ol class="arabic">
1348 <li>
1349 <p>
1350 If <tt>branch.&lt;name&gt;.merge</tt> configuration for the current
1351   branch <tt>&lt;name&gt;</tt> exists, that is the name of the branch at the
1352   remote site that is merged.
1353 </p>
1354 </li>
1355 <li>
1356 <p>
1357 If the refspec is a globbing one, nothing is merged.
1358 </p>
1359 </li>
1360 <li>
1361 <p>
1362 Otherwise the remote branch of the first refspec is merged.
1363 </p>
1364 </li>
1365 </ol></div>
1366 </div>
1367 <h2 id="_examples">EXAMPLES</h2>
1368 <div class="sectionbody">
1369 <div class="ulist"><ul>
1370 <li>
1371 <p>
1372 Update the remote-tracking branches for the repository
1373   you cloned from, then merge one of them into your
1374   current branch:
1375 </p>
1376 <div class="listingblock">
1377 <div class="content">
1378 <pre><tt>$ git pull, git pull origin</tt></pre>
1379 </div></div>
1380 <div class="paragraph"><p>Normally the branch merged in is the HEAD of the remote repository,
1381 but the choice is determined by the branch.&lt;name&gt;.remote and
1382 branch.&lt;name&gt;.merge options; see <a href="git-config.html">git-config(1)</a> for details.</p></div>
1383 </li>
1384 <li>
1385 <p>
1386 Merge into the current branch the remote branch <tt>next</tt>:
1387 </p>
1388 <div class="listingblock">
1389 <div class="content">
1390 <pre><tt>$ git pull origin next</tt></pre>
1391 </div></div>
1392 <div class="paragraph"><p>This leaves a copy of <tt>next</tt> temporarily in FETCH_HEAD, but
1393 does not update any remote-tracking branches. Using remote-tracking
1394 branches, the same can be done by invoking fetch and merge:</p></div>
1395 <div class="listingblock">
1396 <div class="content">
1397 <pre><tt>$ git fetch origin
1398 $ git merge origin/next</tt></pre>
1399 </div></div>
1400 </li>
1401 </ul></div>
1402 <div class="paragraph"><p>If you tried a pull which resulted in a complex conflicts and
1403 would want to start over, you can recover with <em>git reset</em>.</p></div>
1404 </div>
1405 <h2 id="_see_also">SEE ALSO</h2>
1406 <div class="sectionbody">
1407 <div class="paragraph"><p><a href="git-fetch.html">git-fetch(1)</a>, <a href="git-merge.html">git-merge(1)</a>, <a href="git-config.html">git-config(1)</a></p></div>
1408 </div>
1409 <h2 id="_author">Author</h2>
1410 <div class="sectionbody">
1411 <div class="paragraph"><p>Written by Linus Torvalds &lt;<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>&gt;
1412 and Junio C Hamano &lt;<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>&gt;</p></div>
1413 </div>
1414 <h2 id="_documentation">Documentation</h2>
1415 <div class="sectionbody">
1416 <div class="paragraph"><p>Documentation by Jon Loeliger,
1417 David Greaves,
1418 Junio C Hamano and the git-list &lt;<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>&gt;.</p></div>
1419 </div>
1420 <h2 id="_git">GIT</h2>
1421 <div class="sectionbody">
1422 <div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
1423 </div>
1424 <div id="footer">
1425 <div id="footer-text">
1426 Last updated 2010-12-13 08:31:26 UTC
1427 </div>
1428 </div>
1429 </body>
1430 </html>