| blob | 6d0029174e98efe1fcfed1d6047f75558790be1a |
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 }
129 }
133 }
135 /* Block element titles. */
143 }
146 }
150 }
153 }
156 }
162 }
168 }
176 }
181 }
185 }
189 }
190 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
193 }
202 }
206 }
211 }
217 dl {
220 }
221 dt {
226 }
229 }
233 }
236 }
239 }
242 }
245 }
248 }
255 }
259 }
263 }
264 tfoot {
266 }
269 }
272 }
273 /* Because the table frame attribute is overriden by CSS in most browsers. */
276 }
280 }
284 }
290 }
293 }
296 }
302 }
305 }
309 }
313 }
317 }
321 }
326 }
330 }
340 }
345 }
347 div#toc {
349 }
351 div#toctitle {
358 }
363 }
367 }
371 }
375 }
376 /* Overrides for manpage documents */
377 h1 {
382 }
383 h2 {
385 }
388 }
392 }
394 /* Workarounds for IE6's broken and incomplete CSS2. */
400 }
407 }
413 }
418 }
422 }
426 }
431 }
433 /* IE6 sets dynamically generated links as visited. */
435 </style>
437 /*<![CDATA[*/
441 /////////////////////////////////////////////////////////////////////
442 // Table Of Contents generator
443 /////////////////////////////////////////////////////////////////////
445 /* Author: Mihai Bazon, September 2002
446 * http://students.infoiasi.ro/~mishoo
447 *
448 * Table Of Content generator
449 * Version: 0.4
450 *
451 * Feel free to use this script under the terms of the GNU General Public
452 * License, as long as you do not remove or alter this notice.
453 */
455 /* modified by Troy D. Hanson, September 2006. License: GPL */
456 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
458 // toclevels = 1..4.
468 }
470 }
476 }
481 // Function that scans the DOM tree for header elements (the DOM2
482 // nodeIterator API would be a better technique but not supported by all
483 // browsers).
490 }
492 }
493 }
494 }
497 }
512 }
515 },
518 /////////////////////////////////////////////////////////////////////
519 // Footnotes generator
520 /////////////////////////////////////////////////////////////////////
522 /* Based on footnote generation code from:
523 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
524 */
534 n++;
535 // Use [\s\S] in place of . so multi-line matches work.
536 // Because JavaScript has no s (dotall) regex flag.
547 }
548 }
552 // Process footnoterefs.
561 }
562 }
563 }
564 }
566 }
567 /*]]>*/
568 </script>
569 </head>
570 <body>
572 <h1>
573 git-merge(1) Manual Page
574 </h1>
577 <p>git-merge -
578 Join two or more development histories together
579 </p>
580 </div>
581 </div>
592 </div></div>
593 </div>
597 histories diverged from the current branch) into the current
599 from another repository and can be used by hand to merge changes
600 from one branch into another.</p></div>
605 <pre><tt> A---B---C topic
606 /
607 D---E---F---G master</tt></pre>
608 </div></div>
612 in a new commit along with the names of the two parent commits and
613 a log message from the user describing the changes.</p></div>
616 <pre><tt> A---B---C topic
617 / \
618 D---E---F---G---H master</tt></pre>
619 </div></div>
620 <div class="paragraph"><p>The second syntax (<msg> <tt>HEAD</tt> <commit>…) is supported for
621 historical reasons. Do not use it from the command line or in
622 new scripts. It is the same as <tt>git merge -m <msg> <commit>…</tt>.</p></div>
623 <div class="paragraph"><p>The third syntax ("<tt>git merge --abort</tt>") can only be run after the
625 merge process and try to reconstruct the pre-merge state. However,
626 if there were uncommitted changes when the merge started (and
627 especially if those changes were further modified after the merge
629 reconstruct the original (pre-merge) changes. Therefore:</p></div>
630 <div class="paragraph"><p><strong>Warning</strong>: Running <em>git merge</em> with uncommitted changes is
631 discouraged: while possible, it leaves you in a state that is hard to
632 back out of in the case of a conflict.</p></div>
633 </div>
638 --commit
639 </dt>
641 --no-commit
642 </dt>
643 <dd>
644 <p>
645 Perform the merge and commit the result. This option can
646 be used to override --no-commit.
647 </p>
649 failed and do not autocommit, to give the user a chance to
650 inspect and further tweak the merge result before committing.</p></div>
651 </dd>
653 --edit
654 </dt>
656 -e
657 </dt>
658 <dd>
661 <pre><tt>Invoke editor before committing successful merge to further
662 edit the default merge message.</tt></pre>
663 </div></div>
664 </dd>
666 --ff
667 </dt>
669 --no-ff
670 </dt>
671 <dd>
672 <p>
673 Do not generate a merge commit if the merge resolved as
674 a fast-forward, only update the branch pointer. This is
675 the default behavior of git-merge.
676 </p>
678 resolved as a fast-forward.</p></div>
679 </dd>
682 </dt>
684 --no-log
685 </dt>
686 <dd>
687 <p>
688 In addition to branch names, populate the log message with
691 </p>
693 actual commits being merged.</p></div>
694 </dd>
696 --stat
697 </dt>
699 -n
700 </dt>
702 --no-stat
703 </dt>
704 <dd>
705 <p>
706 Show a diffstat at the end of the merge. The diffstat is also
707 controlled by the configuration option merge.stat.
708 </p>
710 merge.</p></div>
711 </dd>
713 --squash
714 </dt>
716 --no-squash
717 </dt>
718 <dd>
719 <p>
720 Produce the working tree and index state as if a real
721 merge happened (except for the merge information),
722 but do not actually make a commit or
725 commit. This allows you to create a single commit on
726 top of the current branch whose effect is the same as
727 merging another branch (or more in case of an octopus).
728 </p>
730 option can be used to override --squash.</p></div>
731 </dd>
733 --ff-only
734 </dt>
735 <dd>
736 <p>
737 Refuse to merge and exit with a non-zero status unless the
739 resolved as a fast-forward.
740 </p>
741 </dd>
744 </dt>
747 </dt>
748 <dd>
749 <p>
750 Use the given merge strategy; can be supplied more than
751 once to specify them in the order they should be tried.
755 </p>
756 </dd>
759 </dt>
762 </dt>
763 <dd>
764 <p>
765 Pass merge strategy specific option through to the merge
766 strategy.
767 </p>
768 </dd>
770 --summary
771 </dt>
773 --no-summary
774 </dt>
775 <dd>
776 <p>
777 Synonyms to --stat and --no-stat; these are deprecated and will be
778 removed in the future.
779 </p>
780 </dd>
782 -q
783 </dt>
785 --quiet
786 </dt>
787 <dd>
788 <p>
789 Operate quietly. Implies --no-progress.
790 </p>
791 </dd>
793 -v
794 </dt>
796 --verbose
797 </dt>
798 <dd>
799 <p>
800 Be verbose.
801 </p>
802 </dd>
804 --progress
805 </dt>
807 --no-progress
808 </dt>
809 <dd>
810 <p>
811 Turn progress on/off explicitly. If neither is specified,
812 progress is shown if standard error is connected to a terminal.
813 Note that not all merge strategies may support progress
814 reporting.
815 </p>
816 </dd>
819 </dt>
820 <dd>
821 <p>
822 Set the commit message to be used for the merge commit (in
823 case one is created).
824 </p>
825 <div class="paragraph"><p>If <tt>--log</tt> is specified, a shortlog of the commits being merged
826 will be appended to the specified message.</p></div>
829 invocations.</p></div>
830 </dd>
832 --rerere-autoupdate
833 </dt>
835 --no-rerere-autoupdate
836 </dt>
837 <dd>
838 <p>
839 Allow the rerere mechanism to update the index with the
840 result of auto-conflict resolution if possible.
841 </p>
842 </dd>
844 --abort
845 </dt>
846 <dd>
847 <p>
848 Abort the current conflict resolution process, and
849 try to reconstruct the pre-merge state.
850 </p>
853 reconstruct these changes. It is therefore recommended to always
855 <div class="paragraph"><p><em>git merge --abort</em> is equivalent to <em>git reset --merge</em> when
857 </dd>
860 </dt>
861 <dd>
862 <p>
863 Commits, usually other branch heads, to merge into our branch.
864 Specifying more than one commit will create a merge with
865 more than two parents (affectionately called an Octopus merge).
866 </p>
867 <div class="paragraph"><p>If no commit is given from the command line, and if <tt>merge.defaultToUpstream</tt>
868 configuration variable is set, merge the remote tracking branches
869 that the current branch is configured to use as its upstream.
870 See also the configuration section of this manual page.</p></div>
871 </dd>
872 </dl></div>
873 </div>
877 good shape and committed locally, so it will not be clobbered if
885 exception is when the changed index entries are in the state that
886 would result from the merge already.)</p></div>
887 <div class="paragraph"><p>If all named commits are already ancestors of <tt>HEAD</tt>, <em>git merge</em>
889 </div>
893 This is the most common case especially when invoked from <em>git
894 pull</em>: you are tracking an upstream repository, you have committed
895 no local changes, and now you want to update to a newer upstream
896 revision. In this case, a new commit is not needed to store the
898 updated to point at the named commit, without creating an extra
899 merge commit.</p></div>
900 <div class="paragraph"><p>This behavior can be suppressed with the <tt>--no-ff</tt> option.</p></div>
901 </div>
905 merged must be tied together by a merge commit that has both of them
906 as its parents.</p></div>
909 updated to it. It is possible to have modifications in the working
910 tree as long as they do not overlap; the update will preserve them.</p></div>
912 happens:</p></div>
914 <li>
915 <p>
917 </p>
918 </li>
919 <li>
920 <p>
922 </p>
923 </li>
924 <li>
925 <p>
926 Paths that merged cleanly are updated both in the index file and
927 in your working tree.
928 </p>
929 </li>
930 <li>
931 <p>
932 For conflicting paths, the index file records up to three
933 versions: stage 1 stores the version from the common ancestor,
937 merge results with familiar conflict markers <tt><<<</tt> <tt>===</tt> <tt>>>></tt>.
938 </p>
939 </li>
940 <li>
941 <p>
942 No other changes are made. In particular, the local
943 modifications you had before you started merge will stay the
944 same and the index entries for them stay as they were,
946 </p>
947 </li>
948 </ol></div>
951 </div>
954 <div class="paragraph"><p>During a merge, the working tree files are updated to reflect the result
955 of the merge. Among the changes made to the common ancestor’s version,
956 non-overlapping ones (that is, you changed an area of the file while the
957 other side left that area intact, or vice versa) are incorporated in the
958 final result verbatim. When both sides made changes to the same area,
959 however, git cannot randomly pick one side over the other, and asks you to
960 resolve it by leaving what both sides did to that area.</p></div>
961 <div class="paragraph"><p>By default, git uses the same style as that is used by "merge" program
962 from the RCS suite to present such a conflicted hunk, like this:</p></div>
965 <pre><tt>Here are lines that are either unchanged from the common
966 ancestor, or cleanly resolved because only one side changed.
967 <<<<<<< yours:sample.txt
968 Conflict resolution is hard;
969 let's go shopping.
970 =======
971 Git makes conflict resolution easy.
972 >>>>>>> theirs:sample.txt
973 And here is another line that is cleanly resolved or unmodified.</tt></pre>
974 </div></div>
975 <div class="paragraph"><p>The area where a pair of conflicting changes happened is marked with markers
976 <tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt>. The part before the <tt>=======</tt>
977 is typically your side, and the part afterwards is typically their side.</p></div>
978 <div class="paragraph"><p>The default format does not show what the original said in the conflicting
979 area. You cannot tell how many lines are deleted and replaced with
980 Barbie’s remark on your side. The only thing you can tell is that your
981 side wants to say it is hard and you’d prefer to go shopping, while the
982 other side wants to claim it is easy.</p></div>
985 may look like this:</p></div>
988 <pre><tt>Here are lines that are either unchanged from the common
989 ancestor, or cleanly resolved because only one side changed.
990 <<<<<<< yours:sample.txt
991 Conflict resolution is hard;
992 let's go shopping.
993 |||||||
994 Conflict resolution is hard.
995 =======
996 Git makes conflict resolution easy.
997 >>>>>>> theirs:sample.txt
998 And here is another line that is cleanly resolved or unmodified.</tt></pre>
999 </div></div>
1000 <div class="paragraph"><p>In addition to the <tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt> markers, it uses
1002 tell that the original just stated a fact, and your side simply gave in to
1003 that statement and gave up, while the other side tried to have a more
1004 positive attitude. You can sometimes come up with a better resolution by
1005 viewing the original.</p></div>
1006 </div>
1011 <li>
1012 <p>
1013 Decide not to merge. The only clean-ups you need are to reset
1016 can be used for this.
1017 </p>
1018 </li>
1019 <li>
1020 <p>
1021 Resolve the conflicts. Git will mark the conflicts in
1022 the working tree. Edit the files into shape and
1024 </p>
1025 </li>
1026 </ul></div>
1029 <li>
1030 <p>
1032 mergetool which will work you through the merge.
1033 </p>
1034 </li>
1035 <li>
1036 <p>
1039 versions.
1040 </p>
1041 </li>
1042 <li>
1043 <p>
1047 </p>
1048 </li>
1049 <li>
1050 <p>
1054 version.
1055 </p>
1056 </li>
1057 </ul></div>
1058 </div>
1062 <li>
1063 <p>
1065 the current branch, making an octopus merge:
1066 </p>
1070 </div></div>
1071 </li>
1072 <li>
1073 <p>
1075 merge strategy:
1076 </p>
1080 </div></div>
1081 </li>
1082 <li>
1083 <p>
1085 a new commit automatically:
1086 </p>
1090 </div></div>
1092 merge, or want to write your own merge commit message.</p></div>
1094 changes into a merge commit. Small fixups like bumping
1095 release/version name would be acceptable.</p></div>
1096 </li>
1097 </ul></div>
1098 </div>
1101 <div class="paragraph"><p>The merge mechanism (<em>git-merge</em> and <em>git-pull</em> commands) allows the
1107 resolve
1108 </dt>
1109 <dd>
1110 <p>
1111 This can only resolve two heads (i.e. the current branch
1112 and another branch you pulled from) using a 3-way merge
1113 algorithm. It tries to carefully detect criss-cross
1114 merge ambiguities and is considered generally safe and
1115 fast.
1116 </p>
1117 </dd>
1119 recursive
1120 </dt>
1121 <dd>
1122 <p>
1123 This can only resolve two heads using a 3-way merge
1124 algorithm. When there is more than one common
1125 ancestor that can be used for 3-way merge, it creates a
1126 merged tree of the common ancestors and uses that as
1127 the reference tree for the 3-way merge. This has been
1128 reported to result in fewer merge conflicts without
1129 causing mis-merges by tests done on actual merge commits
1130 taken from Linux 2.6 kernel development history.
1131 Additionally this can detect and handle merges involving
1132 renames. This is the default merge strategy when
1133 pulling or merging one branch.
1134 </p>
1135 <div class="paragraph"><p>The <em>recursive</em> strategy can take the following options:</p></div>
1138 ours
1139 </dt>
1140 <dd>
1141 <p>
1142 This option forces conflicting hunks to be auto-resolved cleanly by
1144 conflict with our side are reflected to the merge result.
1145 </p>
1146 <div class="paragraph"><p>This should not be confused with the <em>ours</em> merge strategy, which does not
1147 even look at what the other tree contains at all. It discards everything
1149 </dd>
1151 theirs
1152 </dt>
1153 <dd>
1154 <p>
1156 </p>
1157 </dd>
1159 patience
1160 </dt>
1161 <dd>
1162 <p>
1164 to avoid mismerges that sometimes occur due to unimportant
1165 matching lines (e.g., braces from distinct functions). Use
1166 this when the branches to be merged have diverged wildly.
1168 </p>
1169 </dd>
1171 ignore-space-change
1172 </dt>
1174 ignore-all-space
1175 </dt>
1177 ignore-space-at-eol
1178 </dt>
1179 <dd>
1180 <p>
1181 Treats lines with the indicated type of whitespace change as
1182 unchanged for the sake of a three-way merge. Whitespace
1183 changes mixed with other changes to a line are not ignored.
1186 </p>
1188 <li>
1189 <p>
1192 </p>
1193 </li>
1194 <li>
1195 <p>
1198 </p>
1199 </li>
1200 <li>
1201 <p>
1202 Otherwise, the merge proceeds in the usual way.
1203 </p>
1204 </li>
1205 </ul></div>
1206 </dd>
1208 renormalize
1209 </dt>
1210 <dd>
1211 <p>
1212 This runs a virtual check-out and check-in of all three stages
1213 of a file when resolving a three-way merge. This option is
1214 meant to be used when merging branches with different clean
1215 filters or end-of-line normalization rules. See "Merging
1216 branches with differing checkin/checkout attributes" in
1218 </p>
1219 </dd>
1221 no-renormalize
1222 </dt>
1223 <dd>
1224 <p>
1227 </p>
1228 </dd>
1231 </dt>
1232 <dd>
1233 <p>
1234 Controls the similarity threshold used for rename detection.
1236 </p>
1237 </dd>
1240 </dt>
1241 <dd>
1242 <p>
1244 the strategy makes a guess on how two trees must be shifted to
1245 match with each other when merging. Instead, the specified path
1246 is prefixed (or stripped from the beginning) to make the shape of
1247 two trees to match.
1248 </p>
1249 </dd>
1250 </dl></div>
1251 </dd>
1253 octopus
1254 </dt>
1255 <dd>
1256 <p>
1257 This resolves cases with more than two heads, but refuses to do
1258 a complex merge that needs manual resolution. It is
1259 primarily meant to be used for bundling topic branch
1260 heads together. This is the default merge strategy when
1261 pulling or merging more than one branch.
1262 </p>
1263 </dd>
1265 ours
1266 </dt>
1267 <dd>
1268 <p>
1269 This resolves any number of heads, but the resulting tree of the
1270 merge is always that of the current branch head, effectively
1271 ignoring all changes from all other branches. It is meant to
1272 be used to supersede old development history of side
1273 branches. Note that this is different from the -Xours option to
1275 </p>
1276 </dd>
1278 subtree
1279 </dt>
1280 <dd>
1281 <p>
1282 This is a modified recursive strategy. When merging trees A and
1283 B, if B corresponds to a subtree of A, B is first adjusted to
1284 match the tree structure of A, instead of reading the trees at
1285 the same level. This adjustment is also done to the common
1286 ancestor tree.
1287 </p>
1288 </dd>
1289 </dl></div>
1290 </div>
1295 merge.conflictstyle
1296 </dt>
1297 <dd>
1298 <p>
1299 Specify the style in which conflicted hunks are written out to
1300 working tree files upon merge. The default is "merge", which
1303 a <tt>>>>>>>></tt> marker. An alternate style, "diff3", adds a <tt>|||||||</tt>
1305 </p>
1306 </dd>
1308 merge.defaultToUpstream
1309 </dt>
1310 <dd>
1311 <p>
1312 If merge is called without any commit argument, merge the upstream
1313 branches configured for the current branch by using their last
1314 observed values stored in their remote tracking branches.
1318 to their corresponding remote tracking branches, and the tips of
1319 these tracking branches are merged.
1320 </p>
1321 </dd>
1323 merge.ff
1324 </dt>
1325 <dd>
1326 <p>
1327 By default, git does not create an extra merge commit when merging
1328 a commit that is a descendant of the current commit. Instead, the
1330 this variable tells git to create an extra merge commit in such
1334 command line).
1335 </p>
1336 </dd>
1338 merge.log
1339 </dt>
1340 <dd>
1341 <p>
1342 In addition to branch names, populate the log message with at
1343 most the specified number of one-line descriptions from the
1344 actual commits that are being merged. Defaults to false, and
1345 true is a synonym for 20.
1346 </p>
1347 </dd>
1349 merge.renameLimit
1350 </dt>
1351 <dd>
1352 <p>
1353 The number of files to consider when performing rename detection
1354 during a merge; if not specified, defaults to the value of
1355 diff.renameLimit.
1356 </p>
1357 </dd>
1359 merge.renormalize
1360 </dt>
1361 <dd>
1362 <p>
1363 Tell git that canonical representation of files in the
1364 repository has changed over time (e.g. earlier commits record
1365 text files with CRLF line endings, but recent ones use LF line
1366 endings). In such a repository, git can convert the data
1367 recorded in commits to a canonical form before performing a
1368 merge to reduce unnecessary conflicts. For more information,
1369 see section "Merging branches with differing checkin/checkout
1371 </p>
1372 </dd>
1374 merge.stat
1375 </dt>
1376 <dd>
1377 <p>
1378 Whether to print the diffstat between ORIG_HEAD and the merge result
1379 at the end of the merge. True by default.
1380 </p>
1381 </dd>
1383 merge.tool
1384 </dt>
1385 <dd>
1386 <p>
1387 Controls which merge resolution program is used by
1391 and "xxdiff". Any other value is treated is custom merge tool
1393 </p>
1394 </dd>
1396 merge.verbosity
1397 </dt>
1398 <dd>
1399 <p>
1400 Controls the amount of output shown by the recursive merge
1401 strategy. Level 0 outputs nothing except a final error
1402 message if conflicts were detected. Level 1 outputs only
1404 above outputs debugging information. The default is level 2.
1406 </p>
1407 </dd>
1410 </dt>
1411 <dd>
1412 <p>
1413 Defines a human-readable name for a custom low-level
1415 </p>
1416 </dd>
1419 </dt>
1420 <dd>
1421 <p>
1422 Defines the command that implements a custom low-level
1424 </p>
1425 </dd>
1428 </dt>
1429 <dd>
1430 <p>
1431 Names a low-level merge driver to be used when
1432 performing an internal merge between common ancestors.
1434 </p>
1435 </dd>
1438 </dt>
1439 <dd>
1440 <p>
1443 values containing whitespace characters are currently not supported.
1444 </p>
1445 </dd>
1446 </dl></div>
1447 </div>
1450 <div class="paragraph"><p><a href="git-fmt-merge-msg.html">git-fmt-merge-msg(1)</a>, <a href="git-pull.html">git-pull(1)</a>,
1456 </div>
1460 </div>
1461 </div>
1466 </div>
1467 </div>
1468 </body>
1469 </html>