| blob | a92f9454407137b3c9618cbaf5ff9c196d9a948f |
4 <head>
9 /* Debug borders */
11 /*
12 border: 1px solid red;
13 */
14 }
16 body {
18 }
20 a {
23 }
26 }
28 em {
31 }
33 strong {
36 }
38 tt {
40 }
48 }
52 }
53 h2 {
55 }
56 h3 {
58 }
59 h3 + * {
61 }
66 }
68 hr {
70 }
72 p {
75 }
79 }
81 pre {
84 }
86 span#author {
91 }
92 span#email {
93 }
96 }
98 div#footer {
104 }
105 div#footer-text {
108 }
109 div#footer-badges {
112 }
114 div#preamble {
117 }
123 }
127 }
131 }
133 /* Block element titles. */
141 }
144 }
148 }
151 }
154 }
160 }
166 }
171 }
175 }
180 }
183 }
187 }
188 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
191 }
200 }
204 }
209 }
215 dl {
218 }
219 dt {
224 }
227 }
231 }
234 }
237 }
240 }
243 }
246 }
253 }
257 }
258 thead {
261 }
262 tfoot {
264 }
267 }
270 }
271 /* Because the table frame attribute is overriden by CSS in most browsers. */
274 }
278 }
282 }
288 }
291 }
294 }
300 }
303 }
307 }
311 }
315 }
317 div#toctitle {
324 }
329 }
333 }
337 }
341 }
342 /* Overrides for manpage documents */
343 h1 {
348 }
349 h2 {
351 }
354 }
358 }
360 /* Workarounds for IE6's broken and incomplete CSS2. */
366 }
373 }
379 }
384 }
388 }
392 }
397 }
399 /* IE6 sets dynamically generated links as visited. */
401 </style>
402 </head>
403 <body>
405 <h1>
406 git-pull(1) Manual Page
407 </h1>
410 <p>git-pull -
411 Fetch from and merge with another repository or a local branch
412 </p>
413 </div>
414 </div>
417 <div class="paragraph"><p><em>git pull</em> [options] [<repository> [<refspec>…]]</p></div>
418 </div>
424 <div class="paragraph"><p>More precisely, <em>git pull</em> runs <em>git fetch</em> with the given
426 heads into the current branch.
430 arbitrary remote ref (for example, the name of a tag) or even
431 a collection of refs with corresponding remote-tracking branches
433 but usually it is the name of a branch in the remote repository.</p></div>
434 <div class="paragraph"><p>Default values for <repository> and <branch> are read from the
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
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>
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>
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>
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
466 </div>
469 <div class="paragraph"><p>Options meant for <em>git pull</em> itself and the underlying <em>git merge</em>
473 -q
474 </dt>
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>
486 -v
487 </dt>
489 --verbose
490 </dt>
491 <dd>
492 <p>
493 Pass --verbose to git-fetch and git-merge.
494 </p>
495 </dd>
497 --[no-]recurse-submodules[=yes|on-demand|no]
498 </dt>
499 <dd>
500 <p>
501 This option controls if new commits of all populated submodules should
502 be fetched too (see <a href="git-config.html">git-config(1)</a> and <a href="gitmodules.html">gitmodules(5)</a>).
503 That might be necessary to get the data needed for merging submodule
504 commits, a feature git learned in 1.7.3. Notice that the result of a
505 merge will not be checked out in the submodule, "git submodule update"
506 has to be called afterwards to bring the work tree up to date with the
507 merge result.
508 </p>
509 </dd>
510 </dl></div>
511 <h3 id="_options_related_to_merging">Options related to merging</h3><div style="clear:left"></div>
514 --commit
515 </dt>
517 --no-commit
518 </dt>
519 <dd>
520 <p>
521 Perform the merge and commit the result. This option can
522 be used to override --no-commit.
523 </p>
525 failed and do not autocommit, to give the user a chance to
526 inspect and further tweak the merge result before committing.</p></div>
527 </dd>
529 --ff
530 </dt>
532 --no-ff
533 </dt>
534 <dd>
535 <p>
536 Do not generate a merge commit if the merge resolved as
537 a fast-forward, only update the branch pointer. This is
538 the default behavior of git-merge.
539 </p>
541 resolved as a fast-forward.</p></div>
542 </dd>
545 </dt>
547 --no-log
548 </dt>
549 <dd>
550 <p>
551 In addition to branch names, populate the log message with
554 </p>
556 actual commits being merged.</p></div>
557 </dd>
559 --stat
560 </dt>
562 -n
563 </dt>
565 --no-stat
566 </dt>
567 <dd>
568 <p>
569 Show a diffstat at the end of the merge. The diffstat is also
570 controlled by the configuration option merge.stat.
571 </p>
573 merge.</p></div>
574 </dd>
576 --squash
577 </dt>
579 --no-squash
580 </dt>
581 <dd>
582 <p>
583 Produce the working tree and index state as if a real
584 merge happened (except for the merge information),
585 but do not actually make a commit or
588 commit. This allows you to create a single commit on
589 top of the current branch whose effect is the same as
590 merging another branch (or more in case of an octopus).
591 </p>
593 option can be used to override --squash.</p></div>
594 </dd>
596 --ff-only
597 </dt>
598 <dd>
599 <p>
600 Refuse to merge and exit with a non-zero status unless the
602 resolved as a fast-forward.
603 </p>
604 </dd>
607 </dt>
610 </dt>
611 <dd>
612 <p>
613 Use the given merge strategy; can be supplied more than
614 once to specify them in the order they should be tried.
618 </p>
619 </dd>
622 </dt>
625 </dt>
626 <dd>
627 <p>
628 Pass merge strategy specific option through to the merge
629 strategy.
630 </p>
631 </dd>
633 --summary
634 </dt>
636 --no-summary
637 </dt>
638 <dd>
639 <p>
640 Synonyms to --stat and --no-stat; these are deprecated and will be
641 removed in the future.
642 </p>
643 </dd>
645 -q
646 </dt>
648 --quiet
649 </dt>
650 <dd>
651 <p>
652 Operate quietly. Implies --no-progress.
653 </p>
654 </dd>
656 -v
657 </dt>
659 --verbose
660 </dt>
661 <dd>
662 <p>
663 Be verbose.
664 </p>
665 </dd>
667 --progress
668 </dt>
670 --no-progress
671 </dt>
672 <dd>
673 <p>
674 Turn progress on/off explicitly. If neither is specified,
675 progress is shown if standard error is connected to a terminal.
676 Note that not all merge strategies may support progress
677 reporting.
678 </p>
679 </dd>
680 </dl></div>
683 --rebase
684 </dt>
685 <dd>
686 <p>
687 Rebase the current branch on top of the upstream branch after
688 fetching. If there is a remote-tracking branch corresponding to
689 the upstream branch and the upstream branch was rebased since last
690 fetched, the rebase uses that information to avoid rebasing
691 non-local changes.
692 </p>
693 <div class="paragraph"><p>See <tt>branch.<name>.rebase</tt> and <tt>branch.autosetuprebase</tt> in
697 <table><tr>
700 </td>
702 It rewrites history, which does not bode well when you
705 </tr></table>
706 </div>
707 </dd>
709 --no-rebase
710 </dt>
711 <dd>
712 <p>
713 Override earlier --rebase.
714 </p>
715 </dd>
716 </dl></div>
717 <h3 id="_options_related_to_fetching">Options related to fetching</h3><div style="clear:left"></div>
720 --all
721 </dt>
722 <dd>
723 <p>
724 Fetch all remotes.
725 </p>
726 </dd>
728 -a
729 </dt>
731 --append
732 </dt>
733 <dd>
734 <p>
735 Append ref names and object names of fetched refs to the
738 </p>
739 </dd>
742 </dt>
743 <dd>
744 <p>
746 <tt>git clone</tt> with <tt>--depth=<depth></tt> option (see <a href="git-clone.html">git-clone(1)</a>)
747 by the specified number of commits.
748 </p>
749 </dd>
751 -f
752 </dt>
754 --force
755 </dt>
756 <dd>
757 <p>
759 refspec, it refuses to update the local branch
762 overrides that check.
763 </p>
764 </dd>
766 -k
767 </dt>
769 --keep
770 </dt>
771 <dd>
772 <p>
773 Keep downloaded pack.
774 </p>
775 </dd>
777 --no-tags
778 </dt>
779 <dd>
780 <p>
781 By default, tags that point at objects that are downloaded
782 from the remote repository are fetched and stored locally.
783 This option disables this automatic tag following. The default
786 </p>
787 </dd>
789 -u
790 </dt>
792 --update-head-ok
793 </dt>
794 <dd>
795 <p>
797 corresponds to the current branch. This flag disables the
800 implementing your own Porcelain you are not supposed to
801 use it.
802 </p>
803 </dd>
806 </dt>
807 <dd>
808 <p>
809 When given, and the repository to fetch from is handled
811 the command to specify non-default path for the command
812 run on the other end.
813 </p>
814 </dd>
816 --progress
817 </dt>
818 <dd>
819 <p>
820 Progress status is reported on the standard error stream
821 by default when it is attached to a terminal, unless -q
822 is specified. This flag forces progress status even if the
823 standard error stream is not directed to a terminal.
824 </p>
825 </dd>
828 </dt>
829 <dd>
830 <p>
831 The "remote" repository that is the source of a fetch
832 or pull operation. This parameter can be either a URL
835 </p>
836 </dd>
839 </dt>
840 <dd>
841 <p>
845 </p>
850 is updated even if it does not result in a fast-forward
851 update.</p></div>
853 <table><tr>
856 </td>
858 modified in non-linear ways such as being rewound and
859 rebased frequently, then a pull will attempt a merge with
860 an older version of itself, likely conflict, and fail.
861 It is under these conditions that you would want to use
863 be needed. There is currently no easy way to determine
864 or declare that a branch will be made available in a
865 repository with this behavior; the pulling user simply
866 must know this is the expected usage pattern for a branch.</td>
867 </tr></table>
868 </div>
870 <table><tr>
873 </td>
882 the progress of the remote side, and when you see something new
883 on the remote branch, merge it into your development branch with
885 </tr></table>
886 </div>
888 <table><tr>
891 </td>
897 merged into the current branch after fetching. In other words,
898 if you list more than one remote refs, you would be making
902 after fetching all the remote refs. This is because making an
903 Octopus from remote refs is rarely done, while keeping track
904 of multiple remote heads in one-go by fetching more than one
905 is often useful.</td>
906 </tr></table>
907 </div>
910 <li>
911 <p>
912 <tt>tag <tag></tt> means the same as <tt>refs/tags/<tag>:refs/tags/<tag></tt>;
913 it requests fetching everything up to the given tag.
914 </p>
915 </li>
916 <li>
917 <p>
920 branch without storing the remote branch anywhere locally
921 </p>
922 </li>
923 </ul></div>
924 </dd>
925 </dl></div>
926 </div>
929 <div class="paragraph"><p>In general, URLs contain information about the transport protocol, the
930 address of the remote server, and the path to the repository.
931 Depending on the transport protocol, some of this information may be
932 absent.</p></div>
934 protocols. The following syntaxes may be used with them:</p></div>
936 <li>
937 <p>
939 </p>
940 </li>
941 <li>
942 <p>
944 </p>
945 </li>
946 <li>
947 <p>
949 </p>
950 </li>
951 <li>
952 <p>
954 </p>
955 </li>
956 <li>
957 <p>
958 rsync://host.xz/path/to/repo.git/
959 </p>
960 </li>
961 </ul></div>
962 <div class="paragraph"><p>An alternative scp-like syntax may also be used with the ssh protocol:</p></div>
964 <li>
965 <p>
967 </p>
968 </li>
969 </ul></div>
970 <div class="paragraph"><p>The ssh and git protocols additionally support ~username expansion:</p></div>
972 <li>
973 <p>
975 </p>
976 </li>
977 <li>
978 <p>
980 </p>
981 </li>
982 <li>
983 <p>
985 </p>
986 </li>
987 </ul></div>
989 syntaxes may be used:</p></div>
991 <li>
992 <p>
993 /path/to/repo.git/
994 </p>
995 </li>
996 <li>
997 <p>
999 </p>
1000 </li>
1001 </ul></div>
1004 details.</p></div>
1005 <div class="paragraph"><p>When git doesn’t know how to handle a certain transport protocol, it
1007 exists. To explicitly request a remote helper, the following syntax
1008 may be used:</p></div>
1010 <li>
1011 <p>
1013 </p>
1014 </li>
1015 </ul></div>
1016 <div class="paragraph"><p>where <address> may be a path, a server and path, or an arbitrary
1017 URL-like string recognized by the specific remote helper being
1018 invoked. See <a href="git-remote-helpers.html">git-remote-helpers(1)</a> for details.</p></div>
1019 <div class="paragraph"><p>If there are a large number of similarly-named remote repositories and
1020 you want to use a different format for them (such that the URLs you
1021 use will be rewritten into URLs that work), you can create a
1022 configuration section of the form:</p></div>
1027 </div></div>
1032 insteadOf = host.xz:/path/to/
1033 insteadOf = work:</tt></pre>
1034 </div></div>
1035 <div class="paragraph"><p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be
1038 configuration section of the form:</p></div>
1043 </div></div>
1048 pushInsteadOf = git://example.org/</tt></pre>
1049 </div></div>
1051 "ssh://example.org/path/to/repo.git" for pushes, but pulls will still
1052 use the original URL.</p></div>
1053 </div>
1059 <li>
1060 <p>
1062 </p>
1063 </li>
1064 <li>
1065 <p>
1067 </p>
1068 </li>
1069 <li>
1070 <p>
1072 </p>
1073 </li>
1074 </ul></div>
1075 <div class="paragraph"><p>All of these also allow you to omit the refspec from the command line
1076 because they each contain a refspec which git will use by default.</p></div>
1077 <h3 id="_named_remote_in_configuration_file">Named remote in configuration file</h3><div style="clear:left"></div>
1078 <div class="paragraph"><p>You can choose to provide the name of a remote which you had previously
1079 configured using <a href="git-remote.html">git-remote(1)</a>, <a href="git-config.html">git-config(1)</a>
1081 this remote will be used to access the repository. The refspec
1082 of this remote will be used by default when you do
1083 not provide a refspec on the command line. The entry in the
1084 config file would appear like this:</p></div>
1092 </div></div>
1093 <div class="paragraph"><p>The <tt><pushurl></tt> is used for pushes only. It is optional and defaults
1095 <h3 id="_named_file_in_tt_git_dir_remotes_tt">Named file in <tt>$GIT_DIR/remotes</tt></h3><div style="clear:left"></div>
1098 in this file will be used to access the repository. The refspec
1099 in this file will be used as default when you do not
1100 provide a refspec on the command line. This file should have the
1101 following format:</p></div>
1104 <pre><tt> URL: one of the above URL format
1107 </div></div>
1111 be specified for additional branch mappings.</p></div>
1112 <h3 id="_named_file_in_tt_git_dir_branches_tt">Named file in <tt>$GIT_DIR/branches</tt></h3><div style="clear:left"></div>
1115 The URL in this file will be used to access the repository.
1116 This file should have the following format:</p></div>
1120 </div></div>
1121 <div class="paragraph"><p><tt><url></tt> is required; <tt>#<head></tt> is optional.</p></div>
1123 refspecs, if you don’t provide one on the command line.
1130 </div></div>
1135 </div></div>
1136 </div>
1139 <div class="paragraph"><p>The merge mechanism (<em>git-merge</em> and <em>git-pull</em> commands) allows the
1145 resolve
1146 </dt>
1147 <dd>
1148 <p>
1149 This can only resolve two heads (i.e. the current branch
1150 and another branch you pulled from) using a 3-way merge
1151 algorithm. It tries to carefully detect criss-cross
1152 merge ambiguities and is considered generally safe and
1153 fast.
1154 </p>
1155 </dd>
1157 recursive
1158 </dt>
1159 <dd>
1160 <p>
1161 This can only resolve two heads using a 3-way merge
1162 algorithm. When there is more than one common
1163 ancestor that can be used for 3-way merge, it creates a
1164 merged tree of the common ancestors and uses that as
1165 the reference tree for the 3-way merge. This has been
1166 reported to result in fewer merge conflicts without
1167 causing mis-merges by tests done on actual merge commits
1168 taken from Linux 2.6 kernel development history.
1169 Additionally this can detect and handle merges involving
1170 renames. This is the default merge strategy when
1171 pulling or merging one branch.
1172 </p>
1173 <div class="paragraph"><p>The <em>recursive</em> strategy can take the following options:</p></div>
1176 ours
1177 </dt>
1178 <dd>
1179 <p>
1180 This option forces conflicting hunks to be auto-resolved cleanly by
1182 conflict with our side are reflected to the merge result.
1183 </p>
1184 <div class="paragraph"><p>This should not be confused with the <em>ours</em> merge strategy, which does not
1185 even look at what the other tree contains at all. It discards everything
1187 </dd>
1189 theirs
1190 </dt>
1191 <dd>
1192 <p>
1194 </p>
1195 </dd>
1197 patience
1198 </dt>
1199 <dd>
1200 <p>
1202 to avoid mismerges that sometimes occur due to unimportant
1203 matching lines (e.g., braces from distinct functions). Use
1204 this when the branches to be merged have diverged wildly.
1206 </p>
1207 </dd>
1209 ignore-space-change
1210 </dt>
1212 ignore-all-space
1213 </dt>
1215 ignore-space-at-eol
1216 </dt>
1217 <dd>
1218 <p>
1219 Treats lines with the indicated type of whitespace change as
1220 unchanged for the sake of a three-way merge. Whitespace
1221 changes mixed with other changes to a line are not ignored.
1224 </p>
1226 <li>
1227 <p>
1230 </p>
1231 </li>
1232 <li>
1233 <p>
1236 </p>
1237 </li>
1238 <li>
1239 <p>
1240 Otherwise, the merge proceeds in the usual way.
1241 </p>
1242 </li>
1243 </ul></div>
1244 </dd>
1246 renormalize
1247 </dt>
1248 <dd>
1249 <p>
1250 This runs a virtual check-out and check-in of all three stages
1251 of a file when resolving a three-way merge. This option is
1252 meant to be used when merging branches with different clean
1253 filters or end-of-line normalization rules. See "Merging
1254 branches with differing checkin/checkout attributes" in
1256 </p>
1257 </dd>
1259 no-renormalize
1260 </dt>
1261 <dd>
1262 <p>
1265 </p>
1266 </dd>
1269 </dt>
1270 <dd>
1271 <p>
1272 Controls the similarity threshold used for rename detection.
1274 </p>
1275 </dd>
1278 </dt>
1279 <dd>
1280 <p>
1282 the strategy makes a guess on how two trees must be shifted to
1283 match with each other when merging. Instead, the specified path
1284 is prefixed (or stripped from the beginning) to make the shape of
1285 two trees to match.
1286 </p>
1287 </dd>
1288 </dl></div>
1289 </dd>
1291 octopus
1292 </dt>
1293 <dd>
1294 <p>
1295 This resolves cases with more than two heads, but refuses to do
1296 a complex merge that needs manual resolution. It is
1297 primarily meant to be used for bundling topic branch
1298 heads together. This is the default merge strategy when
1299 pulling or merging more than one branch.
1300 </p>
1301 </dd>
1303 ours
1304 </dt>
1305 <dd>
1306 <p>
1307 This resolves any number of heads, but the resulting tree of the
1308 merge is always that of the current branch head, effectively
1309 ignoring all changes from all other branches. It is meant to
1310 be used to supersede old development history of side
1311 branches. Note that this is different from the -Xours option to
1313 </p>
1314 </dd>
1316 subtree
1317 </dt>
1318 <dd>
1319 <p>
1320 This is a modified recursive strategy. When merging trees A and
1321 B, if B corresponds to a subtree of A, B is first adjusted to
1322 match the tree structure of A, instead of reading the trees at
1323 the same level. This adjustment is also done to the common
1324 ancestor tree.
1325 </p>
1326 </dd>
1327 </dl></div>
1328 </div>
1332 Traditionally, this has been equivalent to saying <tt>git pull
1338 and if there is not any such variable, the value on <tt>URL: ` line
1341 optionally store in the remote-tracking branches) when the command is
1342 run without any refspec parameters on the command line, values
1345 file is consulted and its `Pull: ` lines are used.
1346 In addition to the refspec formats described in the OPTIONS
1347 section, you can have a globbing refspec that looks like this:</p></div>
1351 </div></div>
1353 what were fetched in remote-tracking branches), and its LHS and RHS
1355 branches are tracked using remote-tracking branches in
1358 fetching is a bit involved, in order not to break backward
1359 compatibility.</p></div>
1362 <div class="paragraph"><p>When no refspec was given on the command line, then <tt>git pull</tt>
1363 uses the refspec from the configuration or
1365 rules apply:</p></div>
1367 <li>
1368 <p>
1371 remote site that is merged.
1372 </p>
1373 </li>
1374 <li>
1375 <p>
1376 If the refspec is a globbing one, nothing is merged.
1377 </p>
1378 </li>
1379 <li>
1380 <p>
1381 Otherwise the remote branch of the first refspec is merged.
1382 </p>
1383 </li>
1384 </ol></div>
1385 </div>
1389 <li>
1390 <p>
1391 Update the remote-tracking branches for the repository
1392 you cloned from, then merge one of them into your
1393 current branch:
1394 </p>
1398 </div></div>
1401 branch.<name>.merge options; see <a href="git-config.html">git-config(1)</a> for details.</p></div>
1402 </li>
1403 <li>
1404 <p>
1406 </p>
1410 </div></div>
1412 does not update any remote-tracking branches. Using remote-tracking
1413 branches, the same can be done by invoking fetch and merge:</p></div>
1416 <pre><tt>$ git fetch origin
1417 $ git merge origin/next</tt></pre>
1418 </div></div>
1419 </li>
1420 </ul></div>
1423 </div>
1426 <div class="paragraph"><p>Using --recurse-submodules can only fetch new commits in already checked
1427 out submodules right now. When e.g. upstream added a new submodule in the
1428 just fetched commits of the superproject the submodule itself can not be
1429 fetched, making it impossible to check out that submodule later without
1430 having to do a fetch again. This is expected to be fixed in a future git
1431 version.</p></div>
1432 </div>
1435 <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>
1436 </div>
1440 </div>
1444 </div>
1445 </div>
1446 </body>
1447 </html>