| blob | 1f1ffb8860e455252721a43f96c620cef660ad9e |
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-merge(1) Manual Page
407 </h1>
410 <p>git-merge -
411 Join two or more development histories together
412 </p>
413 </div>
414 </div>
424 </div></div>
425 </div>
429 histories diverged from the current branch) into the current
431 from another repository and can be used by hand to merge changes
432 from one branch into another.</p></div>
437 <pre><tt> A---B---C topic
438 /
439 D---E---F---G master</tt></pre>
440 </div></div>
444 in a new commit along with the names of the two parent commits and
445 a log message from the user describing the changes.</p></div>
448 <pre><tt> A---B---C topic
449 / \
450 D---E---F---G---H master</tt></pre>
451 </div></div>
452 <div class="paragraph"><p>The second syntax (<msg> <tt>HEAD</tt> <commit>…) is supported for
453 historical reasons. Do not use it from the command line or in
454 new scripts. It is the same as <tt>git merge -m <msg> <commit>…</tt>.</p></div>
455 <div class="paragraph"><p>The third syntax ("<tt>git merge --abort</tt>") can only be run after the
457 merge process and try to reconstruct the pre-merge state. However,
458 if there were uncommitted changes when the merge started (and
459 especially if those changes were further modified after the merge
461 reconstruct the original (pre-merge) changes. Therefore:</p></div>
462 <div class="paragraph"><p><strong>Warning</strong>: Running <em>git merge</em> with uncommitted changes is
463 discouraged: while possible, it leaves you in a state that is hard to
464 back out of in the case of a conflict.</p></div>
465 </div>
470 --commit
471 </dt>
473 --no-commit
474 </dt>
475 <dd>
476 <p>
477 Perform the merge and commit the result. This option can
478 be used to override --no-commit.
479 </p>
481 failed and do not autocommit, to give the user a chance to
482 inspect and further tweak the merge result before committing.</p></div>
483 </dd>
485 --ff
486 </dt>
488 --no-ff
489 </dt>
490 <dd>
491 <p>
492 Do not generate a merge commit if the merge resolved as
493 a fast-forward, only update the branch pointer. This is
494 the default behavior of git-merge.
495 </p>
497 resolved as a fast-forward.</p></div>
498 </dd>
501 </dt>
503 --no-log
504 </dt>
505 <dd>
506 <p>
507 In addition to branch names, populate the log message with
510 </p>
512 actual commits being merged.</p></div>
513 </dd>
515 --stat
516 </dt>
518 -n
519 </dt>
521 --no-stat
522 </dt>
523 <dd>
524 <p>
525 Show a diffstat at the end of the merge. The diffstat is also
526 controlled by the configuration option merge.stat.
527 </p>
529 merge.</p></div>
530 </dd>
532 --squash
533 </dt>
535 --no-squash
536 </dt>
537 <dd>
538 <p>
539 Produce the working tree and index state as if a real
540 merge happened (except for the merge information),
541 but do not actually make a commit or
544 commit. This allows you to create a single commit on
545 top of the current branch whose effect is the same as
546 merging another branch (or more in case of an octopus).
547 </p>
549 option can be used to override --squash.</p></div>
550 </dd>
552 --ff-only
553 </dt>
554 <dd>
555 <p>
556 Refuse to merge and exit with a non-zero status unless the
558 resolved as a fast-forward.
559 </p>
560 </dd>
563 </dt>
566 </dt>
567 <dd>
568 <p>
569 Use the given merge strategy; can be supplied more than
570 once to specify them in the order they should be tried.
574 </p>
575 </dd>
578 </dt>
581 </dt>
582 <dd>
583 <p>
584 Pass merge strategy specific option through to the merge
585 strategy.
586 </p>
587 </dd>
589 --summary
590 </dt>
592 --no-summary
593 </dt>
594 <dd>
595 <p>
596 Synonyms to --stat and --no-stat; these are deprecated and will be
597 removed in the future.
598 </p>
599 </dd>
601 -q
602 </dt>
604 --quiet
605 </dt>
606 <dd>
607 <p>
608 Operate quietly.
609 </p>
610 </dd>
612 -v
613 </dt>
615 --verbose
616 </dt>
617 <dd>
618 <p>
619 Be verbose.
620 </p>
621 </dd>
624 </dt>
625 <dd>
626 <p>
627 Set the commit message to be used for the merge commit (in
628 case one is created).
629 </p>
630 <div class="paragraph"><p>If <tt>--log</tt> is specified, a shortlog of the commits being merged
631 will be appended to the specified message.</p></div>
634 invocations.</p></div>
635 </dd>
637 --rerere-autoupdate
638 </dt>
640 --no-rerere-autoupdate
641 </dt>
642 <dd>
643 <p>
644 Allow the rerere mechanism to update the index with the
645 result of auto-conflict resolution if possible.
646 </p>
647 </dd>
649 --abort
650 </dt>
651 <dd>
652 <p>
653 Abort the current conflict resolution process, and
654 try to reconstruct the pre-merge state.
655 </p>
658 reconstruct these changes. It is therefore recommended to always
660 <div class="paragraph"><p><em>git merge --abort</em> is equivalent to <em>git reset --merge</em> when
662 </dd>
665 </dt>
666 <dd>
667 <p>
668 Commits, usually other branch heads, to merge into our branch.
671 </p>
672 </dd>
673 </dl></div>
674 </div>
678 good shape and committed locally, so it will not be clobbered if
686 exception is when the changed index entries are in the state that
687 would result from the merge already.)</p></div>
688 <div class="paragraph"><p>If all named commits are already ancestors of <tt>HEAD</tt>, <em>git merge</em>
690 </div>
694 This is the most common case especially when invoked from <em>git
695 pull</em>: you are tracking an upstream repository, you have committed
696 no local changes, and now you want to update to a newer upstream
697 revision. In this case, a new commit is not needed to store the
699 updated to point at the named commit, without creating an extra
700 merge commit.</p></div>
701 <div class="paragraph"><p>This behavior can be suppressed with the <tt>--no-ff</tt> option.</p></div>
702 </div>
706 merged must be tied together by a merge commit that has both of them
707 as its parents.</p></div>
710 updated to it. It is possible to have modifications in the working
711 tree as long as they do not overlap; the update will preserve them.</p></div>
713 happens:</p></div>
715 <li>
716 <p>
718 </p>
719 </li>
720 <li>
721 <p>
723 </p>
724 </li>
725 <li>
726 <p>
727 Paths that merged cleanly are updated both in the index file and
728 in your working tree.
729 </p>
730 </li>
731 <li>
732 <p>
733 For conflicting paths, the index file records up to three
734 versions: stage 1 stores the version from the common ancestor,
738 merge results with familiar conflict markers <tt><<<</tt> <tt>===</tt> <tt>>>></tt>.
739 </p>
740 </li>
741 <li>
742 <p>
743 No other changes are made. In particular, the local
744 modifications you had before you started merge will stay the
745 same and the index entries for them stay as they were,
747 </p>
748 </li>
749 </ol></div>
752 </div>
755 <div class="paragraph"><p>During a merge, the working tree files are updated to reflect the result
756 of the merge. Among the changes made to the common ancestor’s version,
757 non-overlapping ones (that is, you changed an area of the file while the
758 other side left that area intact, or vice versa) are incorporated in the
759 final result verbatim. When both sides made changes to the same area,
760 however, git cannot randomly pick one side over the other, and asks you to
761 resolve it by leaving what both sides did to that area.</p></div>
762 <div class="paragraph"><p>By default, git uses the same style as that is used by "merge" program
763 from the RCS suite to present such a conflicted hunk, like this:</p></div>
766 <pre><tt>Here are lines that are either unchanged from the common
767 ancestor, or cleanly resolved because only one side changed.
768 <<<<<<< yours:sample.txt
769 Conflict resolution is hard;
770 let's go shopping.
771 =======
772 Git makes conflict resolution easy.
773 >>>>>>> theirs:sample.txt
774 And here is another line that is cleanly resolved or unmodified.</tt></pre>
775 </div></div>
776 <div class="paragraph"><p>The area where a pair of conflicting changes happened is marked with markers
777 <tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt>. The part before the <tt>=======</tt>
778 is typically your side, and the part afterwards is typically their side.</p></div>
779 <div class="paragraph"><p>The default format does not show what the original said in the conflicting
780 area. You cannot tell how many lines are deleted and replaced with
781 Barbie’s remark on your side. The only thing you can tell is that your
782 side wants to say it is hard and you’d prefer to go shopping, while the
783 other side wants to claim it is easy.</p></div>
786 may look like this:</p></div>
789 <pre><tt>Here are lines that are either unchanged from the common
790 ancestor, or cleanly resolved because only one side changed.
791 <<<<<<< yours:sample.txt
792 Conflict resolution is hard;
793 let's go shopping.
794 |||||||
795 Conflict resolution is hard.
796 =======
797 Git makes conflict resolution easy.
798 >>>>>>> theirs:sample.txt
799 And here is another line that is cleanly resolved or unmodified.</tt></pre>
800 </div></div>
801 <div class="paragraph"><p>In addition to the <tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt> markers, it uses
803 tell that the original just stated a fact, and your side simply gave in to
804 that statement and gave up, while the other side tried to have a more
805 positive attitude. You can sometimes come up with a better resolution by
806 viewing the original.</p></div>
807 </div>
812 <li>
813 <p>
814 Decide not to merge. The only clean-ups you need are to reset
817 can be used for this.
818 </p>
819 </li>
820 <li>
821 <p>
822 Resolve the conflicts. Git will mark the conflicts in
823 the working tree. Edit the files into shape and
825 </p>
826 </li>
827 </ul></div>
830 <li>
831 <p>
833 mergetool which will work you through the merge.
834 </p>
835 </li>
836 <li>
837 <p>
840 versions.
841 </p>
842 </li>
843 <li>
844 <p>
848 </p>
849 </li>
850 <li>
851 <p>
855 version.
856 </p>
857 </li>
858 </ul></div>
859 </div>
863 <li>
864 <p>
866 the current branch, making an octopus merge:
867 </p>
871 </div></div>
872 </li>
873 <li>
874 <p>
876 merge strategy:
877 </p>
881 </div></div>
882 </li>
883 <li>
884 <p>
886 a new commit automatically:
887 </p>
891 </div></div>
893 merge, or want to write your own merge commit message.</p></div>
895 changes into a merge commit. Small fixups like bumping
896 release/version name would be acceptable.</p></div>
897 </li>
898 </ul></div>
899 </div>
902 <div class="paragraph"><p>The merge mechanism (<em>git-merge</em> and <em>git-pull</em> commands) allows the
908 resolve
909 </dt>
910 <dd>
911 <p>
912 This can only resolve two heads (i.e. the current branch
913 and another branch you pulled from) using a 3-way merge
914 algorithm. It tries to carefully detect criss-cross
915 merge ambiguities and is considered generally safe and
916 fast.
917 </p>
918 </dd>
920 recursive
921 </dt>
922 <dd>
923 <p>
924 This can only resolve two heads using a 3-way merge
925 algorithm. When there is more than one common
926 ancestor that can be used for 3-way merge, it creates a
927 merged tree of the common ancestors and uses that as
928 the reference tree for the 3-way merge. This has been
929 reported to result in fewer merge conflicts without
930 causing mis-merges by tests done on actual merge commits
931 taken from Linux 2.6 kernel development history.
932 Additionally this can detect and handle merges involving
933 renames. This is the default merge strategy when
934 pulling or merging one branch.
935 </p>
936 <div class="paragraph"><p>The <em>recursive</em> strategy can take the following options:</p></div>
939 ours
940 </dt>
941 <dd>
942 <p>
943 This option forces conflicting hunks to be auto-resolved cleanly by
945 conflict with our side are reflected to the merge result.
946 </p>
947 <div class="paragraph"><p>This should not be confused with the <em>ours</em> merge strategy, which does not
948 even look at what the other tree contains at all. It discards everything
950 </dd>
952 theirs
953 </dt>
954 <dd>
955 <p>
957 </p>
958 </dd>
960 patience
961 </dt>
962 <dd>
963 <p>
965 to avoid mismerges that sometimes occur due to unimportant
966 matching lines (e.g., braces from distinct functions). Use
967 this when the branches to be merged have diverged wildly.
969 </p>
970 </dd>
972 ignore-space-change
973 </dt>
975 ignore-all-space
976 </dt>
978 ignore-space-at-eol
979 </dt>
980 <dd>
981 <p>
982 Treats lines with the indicated type of whitespace change as
983 unchanged for the sake of a three-way merge. Whitespace
984 changes mixed with other changes to a line are not ignored.
987 </p>
989 <li>
990 <p>
993 </p>
994 </li>
995 <li>
996 <p>
999 </p>
1000 </li>
1001 <li>
1002 <p>
1003 Otherwise, the merge proceeds in the usual way.
1004 </p>
1005 </li>
1006 </ul></div>
1007 </dd>
1009 renormalize
1010 </dt>
1011 <dd>
1012 <p>
1013 This runs a virtual check-out and check-in of all three stages
1014 of a file when resolving a three-way merge. This option is
1015 meant to be used when merging branches with different clean
1016 filters or end-of-line normalization rules. See "Merging
1017 branches with differing checkin/checkout attributes" in
1019 </p>
1020 </dd>
1022 no-renormalize
1023 </dt>
1024 <dd>
1025 <p>
1028 </p>
1029 </dd>
1032 </dt>
1033 <dd>
1034 <p>
1035 Controls the similarity threshold used for rename detection.
1037 </p>
1038 </dd>
1041 </dt>
1042 <dd>
1043 <p>
1045 the strategy makes a guess on how two trees must be shifted to
1046 match with each other when merging. Instead, the specified path
1047 is prefixed (or stripped from the beginning) to make the shape of
1048 two trees to match.
1049 </p>
1050 </dd>
1051 </dl></div>
1052 </dd>
1054 octopus
1055 </dt>
1056 <dd>
1057 <p>
1058 This resolves cases with more than two heads, but refuses to do
1059 a complex merge that needs manual resolution. It is
1060 primarily meant to be used for bundling topic branch
1061 heads together. This is the default merge strategy when
1062 pulling or merging more than one branch.
1063 </p>
1064 </dd>
1066 ours
1067 </dt>
1068 <dd>
1069 <p>
1070 This resolves any number of heads, but the resulting tree of the
1071 merge is always that of the current branch head, effectively
1072 ignoring all changes from all other branches. It is meant to
1073 be used to supersede old development history of side
1074 branches. Note that this is different from the -Xours option to
1076 </p>
1077 </dd>
1079 subtree
1080 </dt>
1081 <dd>
1082 <p>
1083 This is a modified recursive strategy. When merging trees A and
1084 B, if B corresponds to a subtree of A, B is first adjusted to
1085 match the tree structure of A, instead of reading the trees at
1086 the same level. This adjustment is also done to the common
1087 ancestor tree.
1088 </p>
1089 </dd>
1090 </dl></div>
1091 </div>
1096 merge.conflictstyle
1097 </dt>
1098 <dd>
1099 <p>
1100 Specify the style in which conflicted hunks are written out to
1101 working tree files upon merge. The default is "merge", which
1104 a <tt>>>>>>>></tt> marker. An alternate style, "diff3", adds a <tt>|||||||</tt>
1106 </p>
1107 </dd>
1109 merge.log
1110 </dt>
1111 <dd>
1112 <p>
1113 In addition to branch names, populate the log message with at
1114 most the specified number of one-line descriptions from the
1115 actual commits that are being merged. Defaults to false, and
1116 true is a synonym for 20.
1117 </p>
1118 </dd>
1120 merge.renameLimit
1121 </dt>
1122 <dd>
1123 <p>
1124 The number of files to consider when performing rename detection
1125 during a merge; if not specified, defaults to the value of
1126 diff.renameLimit.
1127 </p>
1128 </dd>
1130 merge.renormalize
1131 </dt>
1132 <dd>
1133 <p>
1134 Tell git that canonical representation of files in the
1135 repository has changed over time (e.g. earlier commits record
1136 text files with CRLF line endings, but recent ones use LF line
1137 endings). In such a repository, git can convert the data
1138 recorded in commits to a canonical form before performing a
1139 merge to reduce unnecessary conflicts. For more information,
1140 see section "Merging branches with differing checkin/checkout
1142 </p>
1143 </dd>
1145 merge.stat
1146 </dt>
1147 <dd>
1148 <p>
1149 Whether to print the diffstat between ORIG_HEAD and the merge result
1150 at the end of the merge. True by default.
1151 </p>
1152 </dd>
1154 merge.tool
1155 </dt>
1156 <dd>
1157 <p>
1158 Controls which merge resolution program is used by
1162 "opendiff". Any other value is treated is custom merge tool
1164 </p>
1165 </dd>
1167 merge.verbosity
1168 </dt>
1169 <dd>
1170 <p>
1171 Controls the amount of output shown by the recursive merge
1172 strategy. Level 0 outputs nothing except a final error
1173 message if conflicts were detected. Level 1 outputs only
1175 above outputs debugging information. The default is level 2.
1177 </p>
1178 </dd>
1181 </dt>
1182 <dd>
1183 <p>
1184 Defines a human-readable name for a custom low-level
1186 </p>
1187 </dd>
1190 </dt>
1191 <dd>
1192 <p>
1193 Defines the command that implements a custom low-level
1195 </p>
1196 </dd>
1199 </dt>
1200 <dd>
1201 <p>
1202 Names a low-level merge driver to be used when
1203 performing an internal merge between common ancestors.
1205 </p>
1206 </dd>
1209 </dt>
1210 <dd>
1211 <p>
1214 values containing whitespace characters are currently not supported.
1215 </p>
1216 </dd>
1217 </dl></div>
1218 </div>
1221 <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>,
1227 </div>
1230 <div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>></p></div>
1231 </div>
1234 <div class="paragraph"><p>Documentation by Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div>
1235 </div>
1239 </div>
1243 </div>
1244 </div>
1245 </body>
1246 </html>