| blob | 426cf144a313b1879e5403f334ec5824bf7f2a48 |
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 --ff
654 </dt>
656 --no-ff
657 </dt>
658 <dd>
659 <p>
660 Do not generate a merge commit if the merge resolved as
661 a fast-forward, only update the branch pointer. This is
662 the default behavior of git-merge.
663 </p>
665 resolved as a fast-forward.</p></div>
666 </dd>
669 </dt>
671 --no-log
672 </dt>
673 <dd>
674 <p>
675 In addition to branch names, populate the log message with
678 </p>
680 actual commits being merged.</p></div>
681 </dd>
683 --stat
684 </dt>
686 -n
687 </dt>
689 --no-stat
690 </dt>
691 <dd>
692 <p>
693 Show a diffstat at the end of the merge. The diffstat is also
694 controlled by the configuration option merge.stat.
695 </p>
697 merge.</p></div>
698 </dd>
700 --squash
701 </dt>
703 --no-squash
704 </dt>
705 <dd>
706 <p>
707 Produce the working tree and index state as if a real
708 merge happened (except for the merge information),
709 but do not actually make a commit or
712 commit. This allows you to create a single commit on
713 top of the current branch whose effect is the same as
714 merging another branch (or more in case of an octopus).
715 </p>
717 option can be used to override --squash.</p></div>
718 </dd>
720 --ff-only
721 </dt>
722 <dd>
723 <p>
724 Refuse to merge and exit with a non-zero status unless the
726 resolved as a fast-forward.
727 </p>
728 </dd>
731 </dt>
734 </dt>
735 <dd>
736 <p>
737 Use the given merge strategy; can be supplied more than
738 once to specify them in the order they should be tried.
742 </p>
743 </dd>
746 </dt>
749 </dt>
750 <dd>
751 <p>
752 Pass merge strategy specific option through to the merge
753 strategy.
754 </p>
755 </dd>
757 --summary
758 </dt>
760 --no-summary
761 </dt>
762 <dd>
763 <p>
764 Synonyms to --stat and --no-stat; these are deprecated and will be
765 removed in the future.
766 </p>
767 </dd>
769 -q
770 </dt>
772 --quiet
773 </dt>
774 <dd>
775 <p>
776 Operate quietly. Implies --no-progress.
777 </p>
778 </dd>
780 -v
781 </dt>
783 --verbose
784 </dt>
785 <dd>
786 <p>
787 Be verbose.
788 </p>
789 </dd>
791 --progress
792 </dt>
794 --no-progress
795 </dt>
796 <dd>
797 <p>
798 Turn progress on/off explicitly. If neither is specified,
799 progress is shown if standard error is connected to a terminal.
800 Note that not all merge strategies may support progress
801 reporting.
802 </p>
803 </dd>
806 </dt>
807 <dd>
808 <p>
809 Set the commit message to be used for the merge commit (in
810 case one is created).
811 </p>
812 <div class="paragraph"><p>If <tt>--log</tt> is specified, a shortlog of the commits being merged
813 will be appended to the specified message.</p></div>
816 invocations.</p></div>
817 </dd>
819 --rerere-autoupdate
820 </dt>
822 --no-rerere-autoupdate
823 </dt>
824 <dd>
825 <p>
826 Allow the rerere mechanism to update the index with the
827 result of auto-conflict resolution if possible.
828 </p>
829 </dd>
831 --abort
832 </dt>
833 <dd>
834 <p>
835 Abort the current conflict resolution process, and
836 try to reconstruct the pre-merge state.
837 </p>
840 reconstruct these changes. It is therefore recommended to always
842 <div class="paragraph"><p><em>git merge --abort</em> is equivalent to <em>git reset --merge</em> when
844 </dd>
847 </dt>
848 <dd>
849 <p>
850 Commits, usually other branch heads, to merge into our branch.
851 Specifying more than one commit will create a merge with
852 more than two parents (affectionately called an Octopus merge).
853 </p>
854 <div class="paragraph"><p>If no commit is given from the command line, and if <tt>merge.defaultToUpstream</tt>
855 configuration variable is set, merge the remote tracking branches
856 that the current branch is configured to use as its upstream.
857 See also the configuration section of this manual page.</p></div>
858 </dd>
859 </dl></div>
860 </div>
864 good shape and committed locally, so it will not be clobbered if
872 exception is when the changed index entries are in the state that
873 would result from the merge already.)</p></div>
874 <div class="paragraph"><p>If all named commits are already ancestors of <tt>HEAD</tt>, <em>git merge</em>
876 </div>
880 This is the most common case especially when invoked from <em>git
881 pull</em>: you are tracking an upstream repository, you have committed
882 no local changes, and now you want to update to a newer upstream
883 revision. In this case, a new commit is not needed to store the
885 updated to point at the named commit, without creating an extra
886 merge commit.</p></div>
887 <div class="paragraph"><p>This behavior can be suppressed with the <tt>--no-ff</tt> option.</p></div>
888 </div>
892 merged must be tied together by a merge commit that has both of them
893 as its parents.</p></div>
896 updated to it. It is possible to have modifications in the working
897 tree as long as they do not overlap; the update will preserve them.</p></div>
899 happens:</p></div>
901 <li>
902 <p>
904 </p>
905 </li>
906 <li>
907 <p>
909 </p>
910 </li>
911 <li>
912 <p>
913 Paths that merged cleanly are updated both in the index file and
914 in your working tree.
915 </p>
916 </li>
917 <li>
918 <p>
919 For conflicting paths, the index file records up to three
920 versions: stage 1 stores the version from the common ancestor,
924 merge results with familiar conflict markers <tt><<<</tt> <tt>===</tt> <tt>>>></tt>.
925 </p>
926 </li>
927 <li>
928 <p>
929 No other changes are made. In particular, the local
930 modifications you had before you started merge will stay the
931 same and the index entries for them stay as they were,
933 </p>
934 </li>
935 </ol></div>
938 </div>
941 <div class="paragraph"><p>During a merge, the working tree files are updated to reflect the result
942 of the merge. Among the changes made to the common ancestor’s version,
943 non-overlapping ones (that is, you changed an area of the file while the
944 other side left that area intact, or vice versa) are incorporated in the
945 final result verbatim. When both sides made changes to the same area,
946 however, git cannot randomly pick one side over the other, and asks you to
947 resolve it by leaving what both sides did to that area.</p></div>
948 <div class="paragraph"><p>By default, git uses the same style as that is used by "merge" program
949 from the RCS suite to present such a conflicted hunk, like this:</p></div>
952 <pre><tt>Here are lines that are either unchanged from the common
953 ancestor, or cleanly resolved because only one side changed.
954 <<<<<<< yours:sample.txt
955 Conflict resolution is hard;
956 let's go shopping.
957 =======
958 Git makes conflict resolution easy.
959 >>>>>>> theirs:sample.txt
960 And here is another line that is cleanly resolved or unmodified.</tt></pre>
961 </div></div>
962 <div class="paragraph"><p>The area where a pair of conflicting changes happened is marked with markers
963 <tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt>. The part before the <tt>=======</tt>
964 is typically your side, and the part afterwards is typically their side.</p></div>
965 <div class="paragraph"><p>The default format does not show what the original said in the conflicting
966 area. You cannot tell how many lines are deleted and replaced with
967 Barbie’s remark on your side. The only thing you can tell is that your
968 side wants to say it is hard and you’d prefer to go shopping, while the
969 other side wants to claim it is easy.</p></div>
972 may look like this:</p></div>
975 <pre><tt>Here are lines that are either unchanged from the common
976 ancestor, or cleanly resolved because only one side changed.
977 <<<<<<< yours:sample.txt
978 Conflict resolution is hard;
979 let's go shopping.
980 |||||||
981 Conflict resolution is hard.
982 =======
983 Git makes conflict resolution easy.
984 >>>>>>> theirs:sample.txt
985 And here is another line that is cleanly resolved or unmodified.</tt></pre>
986 </div></div>
987 <div class="paragraph"><p>In addition to the <tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt> markers, it uses
989 tell that the original just stated a fact, and your side simply gave in to
990 that statement and gave up, while the other side tried to have a more
991 positive attitude. You can sometimes come up with a better resolution by
992 viewing the original.</p></div>
993 </div>
998 <li>
999 <p>
1000 Decide not to merge. The only clean-ups you need are to reset
1003 can be used for this.
1004 </p>
1005 </li>
1006 <li>
1007 <p>
1008 Resolve the conflicts. Git will mark the conflicts in
1009 the working tree. Edit the files into shape and
1011 </p>
1012 </li>
1013 </ul></div>
1016 <li>
1017 <p>
1019 mergetool which will work you through the merge.
1020 </p>
1021 </li>
1022 <li>
1023 <p>
1026 versions.
1027 </p>
1028 </li>
1029 <li>
1030 <p>
1034 </p>
1035 </li>
1036 <li>
1037 <p>
1041 version.
1042 </p>
1043 </li>
1044 </ul></div>
1045 </div>
1049 <li>
1050 <p>
1052 the current branch, making an octopus merge:
1053 </p>
1057 </div></div>
1058 </li>
1059 <li>
1060 <p>
1062 merge strategy:
1063 </p>
1067 </div></div>
1068 </li>
1069 <li>
1070 <p>
1072 a new commit automatically:
1073 </p>
1077 </div></div>
1079 merge, or want to write your own merge commit message.</p></div>
1081 changes into a merge commit. Small fixups like bumping
1082 release/version name would be acceptable.</p></div>
1083 </li>
1084 </ul></div>
1085 </div>
1088 <div class="paragraph"><p>The merge mechanism (<em>git-merge</em> and <em>git-pull</em> commands) allows the
1094 resolve
1095 </dt>
1096 <dd>
1097 <p>
1098 This can only resolve two heads (i.e. the current branch
1099 and another branch you pulled from) using a 3-way merge
1100 algorithm. It tries to carefully detect criss-cross
1101 merge ambiguities and is considered generally safe and
1102 fast.
1103 </p>
1104 </dd>
1106 recursive
1107 </dt>
1108 <dd>
1109 <p>
1110 This can only resolve two heads using a 3-way merge
1111 algorithm. When there is more than one common
1112 ancestor that can be used for 3-way merge, it creates a
1113 merged tree of the common ancestors and uses that as
1114 the reference tree for the 3-way merge. This has been
1115 reported to result in fewer merge conflicts without
1116 causing mis-merges by tests done on actual merge commits
1117 taken from Linux 2.6 kernel development history.
1118 Additionally this can detect and handle merges involving
1119 renames. This is the default merge strategy when
1120 pulling or merging one branch.
1121 </p>
1122 <div class="paragraph"><p>The <em>recursive</em> strategy can take the following options:</p></div>
1125 ours
1126 </dt>
1127 <dd>
1128 <p>
1129 This option forces conflicting hunks to be auto-resolved cleanly by
1131 conflict with our side are reflected to the merge result.
1132 </p>
1133 <div class="paragraph"><p>This should not be confused with the <em>ours</em> merge strategy, which does not
1134 even look at what the other tree contains at all. It discards everything
1136 </dd>
1138 theirs
1139 </dt>
1140 <dd>
1141 <p>
1143 </p>
1144 </dd>
1146 patience
1147 </dt>
1148 <dd>
1149 <p>
1151 to avoid mismerges that sometimes occur due to unimportant
1152 matching lines (e.g., braces from distinct functions). Use
1153 this when the branches to be merged have diverged wildly.
1155 </p>
1156 </dd>
1158 ignore-space-change
1159 </dt>
1161 ignore-all-space
1162 </dt>
1164 ignore-space-at-eol
1165 </dt>
1166 <dd>
1167 <p>
1168 Treats lines with the indicated type of whitespace change as
1169 unchanged for the sake of a three-way merge. Whitespace
1170 changes mixed with other changes to a line are not ignored.
1173 </p>
1175 <li>
1176 <p>
1179 </p>
1180 </li>
1181 <li>
1182 <p>
1185 </p>
1186 </li>
1187 <li>
1188 <p>
1189 Otherwise, the merge proceeds in the usual way.
1190 </p>
1191 </li>
1192 </ul></div>
1193 </dd>
1195 renormalize
1196 </dt>
1197 <dd>
1198 <p>
1199 This runs a virtual check-out and check-in of all three stages
1200 of a file when resolving a three-way merge. This option is
1201 meant to be used when merging branches with different clean
1202 filters or end-of-line normalization rules. See "Merging
1203 branches with differing checkin/checkout attributes" in
1205 </p>
1206 </dd>
1208 no-renormalize
1209 </dt>
1210 <dd>
1211 <p>
1214 </p>
1215 </dd>
1218 </dt>
1219 <dd>
1220 <p>
1221 Controls the similarity threshold used for rename detection.
1223 </p>
1224 </dd>
1227 </dt>
1228 <dd>
1229 <p>
1231 the strategy makes a guess on how two trees must be shifted to
1232 match with each other when merging. Instead, the specified path
1233 is prefixed (or stripped from the beginning) to make the shape of
1234 two trees to match.
1235 </p>
1236 </dd>
1237 </dl></div>
1238 </dd>
1240 octopus
1241 </dt>
1242 <dd>
1243 <p>
1244 This resolves cases with more than two heads, but refuses to do
1245 a complex merge that needs manual resolution. It is
1246 primarily meant to be used for bundling topic branch
1247 heads together. This is the default merge strategy when
1248 pulling or merging more than one branch.
1249 </p>
1250 </dd>
1252 ours
1253 </dt>
1254 <dd>
1255 <p>
1256 This resolves any number of heads, but the resulting tree of the
1257 merge is always that of the current branch head, effectively
1258 ignoring all changes from all other branches. It is meant to
1259 be used to supersede old development history of side
1260 branches. Note that this is different from the -Xours option to
1262 </p>
1263 </dd>
1265 subtree
1266 </dt>
1267 <dd>
1268 <p>
1269 This is a modified recursive strategy. When merging trees A and
1270 B, if B corresponds to a subtree of A, B is first adjusted to
1271 match the tree structure of A, instead of reading the trees at
1272 the same level. This adjustment is also done to the common
1273 ancestor tree.
1274 </p>
1275 </dd>
1276 </dl></div>
1277 </div>
1282 merge.conflictstyle
1283 </dt>
1284 <dd>
1285 <p>
1286 Specify the style in which conflicted hunks are written out to
1287 working tree files upon merge. The default is "merge", which
1290 a <tt>>>>>>>></tt> marker. An alternate style, "diff3", adds a <tt>|||||||</tt>
1292 </p>
1293 </dd>
1295 merge.defaultToUpstream
1296 </dt>
1297 <dd>
1298 <p>
1299 If merge is called without any commit argument, merge the upstream
1300 branches configured for the current branch by using their last
1301 observed values stored in their remote tracking branches.
1305 to their corresponding remote tracking branches, and the tips of
1306 these tracking branches are merged.
1307 </p>
1308 </dd>
1310 merge.ff
1311 </dt>
1312 <dd>
1313 <p>
1314 By default, git does not create an extra merge commit when merging
1315 a commit that is a descendant of the current commit. Instead, the
1317 this variable tells git to create an extra merge commit in such
1321 command line).
1322 </p>
1323 </dd>
1325 merge.log
1326 </dt>
1327 <dd>
1328 <p>
1329 In addition to branch names, populate the log message with at
1330 most the specified number of one-line descriptions from the
1331 actual commits that are being merged. Defaults to false, and
1332 true is a synonym for 20.
1333 </p>
1334 </dd>
1336 merge.renameLimit
1337 </dt>
1338 <dd>
1339 <p>
1340 The number of files to consider when performing rename detection
1341 during a merge; if not specified, defaults to the value of
1342 diff.renameLimit.
1343 </p>
1344 </dd>
1346 merge.renormalize
1347 </dt>
1348 <dd>
1349 <p>
1350 Tell git that canonical representation of files in the
1351 repository has changed over time (e.g. earlier commits record
1352 text files with CRLF line endings, but recent ones use LF line
1353 endings). In such a repository, git can convert the data
1354 recorded in commits to a canonical form before performing a
1355 merge to reduce unnecessary conflicts. For more information,
1356 see section "Merging branches with differing checkin/checkout
1358 </p>
1359 </dd>
1361 merge.stat
1362 </dt>
1363 <dd>
1364 <p>
1365 Whether to print the diffstat between ORIG_HEAD and the merge result
1366 at the end of the merge. True by default.
1367 </p>
1368 </dd>
1370 merge.tool
1371 </dt>
1372 <dd>
1373 <p>
1374 Controls which merge resolution program is used by
1378 and "xxdiff". Any other value is treated is custom merge tool
1380 </p>
1381 </dd>
1383 merge.verbosity
1384 </dt>
1385 <dd>
1386 <p>
1387 Controls the amount of output shown by the recursive merge
1388 strategy. Level 0 outputs nothing except a final error
1389 message if conflicts were detected. Level 1 outputs only
1391 above outputs debugging information. The default is level 2.
1393 </p>
1394 </dd>
1397 </dt>
1398 <dd>
1399 <p>
1400 Defines a human-readable name for a custom low-level
1402 </p>
1403 </dd>
1406 </dt>
1407 <dd>
1408 <p>
1409 Defines the command that implements a custom low-level
1411 </p>
1412 </dd>
1415 </dt>
1416 <dd>
1417 <p>
1418 Names a low-level merge driver to be used when
1419 performing an internal merge between common ancestors.
1421 </p>
1422 </dd>
1425 </dt>
1426 <dd>
1427 <p>
1430 values containing whitespace characters are currently not supported.
1431 </p>
1432 </dd>
1433 </dl></div>
1434 </div>
1437 <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>,
1443 </div>
1447 </div>
1448 </div>
1453 </div>
1454 </div>
1455 </body>
1456 </html>