| blob | 26452243db07051f56efc154fae9dc0ccbbb521c |
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>
423 </div></div>
424 </div>
428 histories diverged from the current branch) into the current
430 from another repository and can be used by hand to merge changes
431 from one branch into another.</p></div>
436 <pre><tt> A---B---C topic
437 /
438 D---E---F---G master</tt></pre>
439 </div></div>
443 in a new commit along with the names of the two parent commits and
444 a log message from the user describing the changes.</p></div>
447 <pre><tt> A---B---C topic
448 / \
449 D---E---F---G---H master</tt></pre>
450 </div></div>
451 <div class="paragraph"><p>The second syntax (<msg> <tt>HEAD</tt> <commit>…) is supported for
452 historical reasons. Do not use it from the command line or in
453 new scripts. It is the same as <tt>git merge -m <msg> <commit>…</tt>.</p></div>
454 <div class="paragraph"><p><strong>Warning</strong>: Running <em>git merge</em> with uncommitted changes is
455 discouraged: while possible, it leaves you in a state that is hard to
456 back out of in the case of a conflict.</p></div>
457 </div>
462 --commit
463 </dt>
465 --no-commit
466 </dt>
467 <dd>
468 <p>
469 Perform the merge and commit the result. This option can
470 be used to override --no-commit.
471 </p>
473 failed and do not autocommit, to give the user a chance to
474 inspect and further tweak the merge result before committing.</p></div>
475 </dd>
477 --ff
478 </dt>
480 --no-ff
481 </dt>
482 <dd>
483 <p>
484 Do not generate a merge commit if the merge resolved as
485 a fast-forward, only update the branch pointer. This is
486 the default behavior of git-merge.
487 </p>
489 resolved as a fast-forward.</p></div>
490 </dd>
493 </dt>
495 --no-log
496 </dt>
497 <dd>
498 <p>
499 In addition to branch names, populate the log message with
502 </p>
504 actual commits being merged.</p></div>
505 </dd>
507 --stat
508 </dt>
510 -n
511 </dt>
513 --no-stat
514 </dt>
515 <dd>
516 <p>
517 Show a diffstat at the end of the merge. The diffstat is also
518 controlled by the configuration option merge.stat.
519 </p>
521 merge.</p></div>
522 </dd>
524 --squash
525 </dt>
527 --no-squash
528 </dt>
529 <dd>
530 <p>
531 Produce the working tree and index state as if a real
532 merge happened (except for the merge information),
533 but do not actually make a commit or
536 commit. This allows you to create a single commit on
537 top of the current branch whose effect is the same as
538 merging another branch (or more in case of an octopus).
539 </p>
541 option can be used to override --squash.</p></div>
542 </dd>
544 --ff-only
545 </dt>
546 <dd>
547 <p>
548 Refuse to merge and exit with a non-zero status unless the
550 resolved as a fast-forward.
551 </p>
552 </dd>
555 </dt>
558 </dt>
559 <dd>
560 <p>
561 Use the given merge strategy; can be supplied more than
562 once to specify them in the order they should be tried.
566 </p>
567 </dd>
570 </dt>
573 </dt>
574 <dd>
575 <p>
576 Pass merge strategy specific option through to the merge
577 strategy.
578 </p>
579 </dd>
581 --summary
582 </dt>
584 --no-summary
585 </dt>
586 <dd>
587 <p>
588 Synonyms to --stat and --no-stat; these are deprecated and will be
589 removed in the future.
590 </p>
591 </dd>
593 -q
594 </dt>
596 --quiet
597 </dt>
598 <dd>
599 <p>
600 Operate quietly.
601 </p>
602 </dd>
604 -v
605 </dt>
607 --verbose
608 </dt>
609 <dd>
610 <p>
611 Be verbose.
612 </p>
613 </dd>
616 </dt>
617 <dd>
618 <p>
619 Set the commit message to be used for the merge commit (in
620 case one is created).
621 </p>
622 <div class="paragraph"><p>If <tt>--log</tt> is specified, a shortlog of the commits being merged
623 will be appended to the specified message.</p></div>
626 invocations.</p></div>
627 </dd>
629 --rerere-autoupdate
630 </dt>
632 --no-rerere-autoupdate
633 </dt>
634 <dd>
635 <p>
636 Allow the rerere mechanism to update the index with the
637 result of auto-conflict resolution if possible.
638 </p>
639 </dd>
642 </dt>
643 <dd>
644 <p>
645 Commits, usually other branch heads, to merge into our branch.
648 </p>
649 </dd>
650 </dl></div>
651 </div>
655 good shape and committed locally, so it will not be clobbered if
663 exception is when the changed index entries are in the state that
664 would result from the merge already.)</p></div>
665 <div class="paragraph"><p>If all named commits are already ancestors of <tt>HEAD</tt>, <em>git merge</em>
667 </div>
671 This is the most common case especially when invoked from <em>git
672 pull</em>: you are tracking an upstream repository, you have committed
673 no local changes, and now you want to update to a newer upstream
674 revision. In this case, a new commit is not needed to store the
676 updated to point at the named commit, without creating an extra
677 merge commit.</p></div>
678 <div class="paragraph"><p>This behavior can be suppressed with the <tt>--no-ff</tt> option.</p></div>
679 </div>
683 merged must be tied together by a merge commit that has both of them
684 as its parents.</p></div>
687 updated to it. It is possible to have modifications in the working
688 tree as long as they do not overlap; the update will preserve them.</p></div>
690 happens:</p></div>
692 <li>
693 <p>
695 </p>
696 </li>
697 <li>
698 <p>
700 </p>
701 </li>
702 <li>
703 <p>
704 Paths that merged cleanly are updated both in the index file and
705 in your working tree.
706 </p>
707 </li>
708 <li>
709 <p>
710 For conflicting paths, the index file records up to three
711 versions: stage 1 stores the version from the common ancestor,
715 merge results with familiar conflict markers <tt><<<</tt> <tt>===</tt> <tt>>>></tt>.
716 </p>
717 </li>
718 <li>
719 <p>
720 No other changes are made. In particular, the local
721 modifications you had before you started merge will stay the
722 same and the index entries for them stay as they were,
724 </p>
725 </li>
726 </ol></div>
729 </div>
732 <div class="paragraph"><p>During a merge, the working tree files are updated to reflect the result
733 of the merge. Among the changes made to the common ancestor’s version,
734 non-overlapping ones (that is, you changed an area of the file while the
735 other side left that area intact, or vice versa) are incorporated in the
736 final result verbatim. When both sides made changes to the same area,
737 however, git cannot randomly pick one side over the other, and asks you to
738 resolve it by leaving what both sides did to that area.</p></div>
739 <div class="paragraph"><p>By default, git uses the same style as that is used by "merge" program
740 from the RCS suite to present such a conflicted hunk, like this:</p></div>
743 <pre><tt>Here are lines that are either unchanged from the common
744 ancestor, or cleanly resolved because only one side changed.
745 <<<<<<< yours:sample.txt
746 Conflict resolution is hard;
747 let's go shopping.
748 =======
749 Git makes conflict resolution easy.
750 >>>>>>> theirs:sample.txt
751 And here is another line that is cleanly resolved or unmodified.</tt></pre>
752 </div></div>
753 <div class="paragraph"><p>The area where a pair of conflicting changes happened is marked with markers
754 <tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt>. The part before the <tt>=======</tt>
755 is typically your side, and the part afterwards is typically their side.</p></div>
756 <div class="paragraph"><p>The default format does not show what the original said in the conflicting
757 area. You cannot tell how many lines are deleted and replaced with
758 Barbie’s remark on your side. The only thing you can tell is that your
759 side wants to say it is hard and you’d prefer to go shopping, while the
760 other side wants to claim it is easy.</p></div>
763 may look 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 Conflict resolution is hard.
773 =======
774 Git makes conflict resolution easy.
775 >>>>>>> theirs:sample.txt
776 And here is another line that is cleanly resolved or unmodified.</tt></pre>
777 </div></div>
778 <div class="paragraph"><p>In addition to the <tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt> markers, it uses
780 tell that the original just stated a fact, and your side simply gave in to
781 that statement and gave up, while the other side tried to have a more
782 positive attitude. You can sometimes come up with a better resolution by
783 viewing the original.</p></div>
784 </div>
789 <li>
790 <p>
791 Decide not to merge. The only clean-ups you need are to reset
794 be used for this.
795 </p>
796 </li>
797 <li>
798 <p>
799 Resolve the conflicts. Git will mark the conflicts in
800 the working tree. Edit the files into shape and
802 </p>
803 </li>
804 </ul></div>
807 <li>
808 <p>
810 mergetool which will work you through the merge.
811 </p>
812 </li>
813 <li>
814 <p>
817 versions.
818 </p>
819 </li>
820 <li>
821 <p>
825 </p>
826 </li>
827 <li>
828 <p>
832 version.
833 </p>
834 </li>
835 </ul></div>
836 </div>
840 <li>
841 <p>
843 the current branch, making an octopus merge:
844 </p>
848 </div></div>
849 </li>
850 <li>
851 <p>
853 merge strategy:
854 </p>
858 </div></div>
859 </li>
860 <li>
861 <p>
863 a new commit automatically:
864 </p>
868 </div></div>
870 merge, or want to write your own merge commit message.</p></div>
872 changes into a merge commit. Small fixups like bumping
873 release/version name would be acceptable.</p></div>
874 </li>
875 </ul></div>
876 </div>
879 <div class="paragraph"><p>The merge mechanism (<em>git-merge</em> and <em>git-pull</em> commands) allows the
885 resolve
886 </dt>
887 <dd>
888 <p>
889 This can only resolve two heads (i.e. the current branch
890 and another branch you pulled from) using a 3-way merge
891 algorithm. It tries to carefully detect criss-cross
892 merge ambiguities and is considered generally safe and
893 fast.
894 </p>
895 </dd>
897 recursive
898 </dt>
899 <dd>
900 <p>
901 This can only resolve two heads using a 3-way merge
902 algorithm. When there is more than one common
903 ancestor that can be used for 3-way merge, it creates a
904 merged tree of the common ancestors and uses that as
905 the reference tree for the 3-way merge. This has been
906 reported to result in fewer merge conflicts without
907 causing mis-merges by tests done on actual merge commits
908 taken from Linux 2.6 kernel development history.
909 Additionally this can detect and handle merges involving
910 renames. This is the default merge strategy when
911 pulling or merging one branch.
912 </p>
913 <div class="paragraph"><p>The <em>recursive</em> strategy can take the following options:</p></div>
916 ours
917 </dt>
918 <dd>
919 <p>
920 This option forces conflicting hunks to be auto-resolved cleanly by
922 conflict with our side are reflected to the merge result.
923 </p>
924 <div class="paragraph"><p>This should not be confused with the <em>ours</em> merge strategy, which does not
925 even look at what the other tree contains at all. It discards everything
927 </dd>
929 theirs
930 </dt>
931 <dd>
932 <p>
934 </p>
935 </dd>
937 patience
938 </dt>
939 <dd>
940 <p>
942 to avoid mismerges that sometimes occur due to unimportant
943 matching lines (e.g., braces from distinct functions). Use
944 this when the branches to be merged have diverged wildly.
946 </p>
947 </dd>
949 ignore-space-change
950 </dt>
952 ignore-all-space
953 </dt>
955 ignore-space-at-eol
956 </dt>
957 <dd>
958 <p>
959 Treats lines with the indicated type of whitespace change as
960 unchanged for the sake of a three-way merge. Whitespace
961 changes mixed with other changes to a line are not ignored.
964 </p>
966 <li>
967 <p>
970 </p>
971 </li>
972 <li>
973 <p>
976 </p>
977 </li>
978 <li>
979 <p>
980 Otherwise, the merge proceeds in the usual way.
981 </p>
982 </li>
983 </ul></div>
984 </dd>
986 renormalize
987 </dt>
988 <dd>
989 <p>
990 This runs a virtual check-out and check-in of all three stages
991 of a file when resolving a three-way merge. This option is
992 meant to be used when merging branches with different clean
993 filters or end-of-line normalization rules. See "Merging
994 branches with differing checkin/checkout attributes" in
996 </p>
997 </dd>
999 no-renormalize
1000 </dt>
1001 <dd>
1002 <p>
1005 </p>
1006 </dd>
1009 </dt>
1010 <dd>
1011 <p>
1012 Controls the similarity threshold used for rename detection.
1014 </p>
1015 </dd>
1018 </dt>
1019 <dd>
1020 <p>
1022 the strategy makes a guess on how two trees must be shifted to
1023 match with each other when merging. Instead, the specified path
1024 is prefixed (or stripped from the beginning) to make the shape of
1025 two trees to match.
1026 </p>
1027 </dd>
1028 </dl></div>
1029 </dd>
1031 octopus
1032 </dt>
1033 <dd>
1034 <p>
1035 This resolves cases with more than two heads, but refuses to do
1036 a complex merge that needs manual resolution. It is
1037 primarily meant to be used for bundling topic branch
1038 heads together. This is the default merge strategy when
1039 pulling or merging more than one branch.
1040 </p>
1041 </dd>
1043 ours
1044 </dt>
1045 <dd>
1046 <p>
1047 This resolves any number of heads, but the resulting tree of the
1048 merge is always that of the current branch head, effectively
1049 ignoring all changes from all other branches. It is meant to
1050 be used to supersede old development history of side
1051 branches. Note that this is different from the -Xours option to
1053 </p>
1054 </dd>
1056 subtree
1057 </dt>
1058 <dd>
1059 <p>
1060 This is a modified recursive strategy. When merging trees A and
1061 B, if B corresponds to a subtree of A, B is first adjusted to
1062 match the tree structure of A, instead of reading the trees at
1063 the same level. This adjustment is also done to the common
1064 ancestor tree.
1065 </p>
1066 </dd>
1067 </dl></div>
1068 </div>
1073 merge.conflictstyle
1074 </dt>
1075 <dd>
1076 <p>
1077 Specify the style in which conflicted hunks are written out to
1078 working tree files upon merge. The default is "merge", which
1081 a <tt>>>>>>>></tt> marker. An alternate style, "diff3", adds a <tt>|||||||</tt>
1083 </p>
1084 </dd>
1086 merge.log
1087 </dt>
1088 <dd>
1089 <p>
1090 In addition to branch names, populate the log message with at
1091 most the specified number of one-line descriptions from the
1092 actual commits that are being merged. Defaults to false, and
1093 true is a synoym for 20.
1094 </p>
1095 </dd>
1097 merge.renameLimit
1098 </dt>
1099 <dd>
1100 <p>
1101 The number of files to consider when performing rename detection
1102 during a merge; if not specified, defaults to the value of
1103 diff.renameLimit.
1104 </p>
1105 </dd>
1107 merge.renormalize
1108 </dt>
1109 <dd>
1110 <p>
1111 Tell git that canonical representation of files in the
1112 repository has changed over time (e.g. earlier commits record
1113 text files with CRLF line endings, but recent ones use LF line
1114 endings). In such a repository, git can convert the data
1115 recorded in commits to a canonical form before performing a
1116 merge to reduce unnecessary conflicts. For more information,
1117 see section "Merging branches with differing checkin/checkout
1119 </p>
1120 </dd>
1122 merge.stat
1123 </dt>
1124 <dd>
1125 <p>
1126 Whether to print the diffstat between ORIG_HEAD and the merge result
1127 at the end of the merge. True by default.
1128 </p>
1129 </dd>
1131 merge.tool
1132 </dt>
1133 <dd>
1134 <p>
1135 Controls which merge resolution program is used by
1139 "opendiff". Any other value is treated is custom merge tool
1141 </p>
1142 </dd>
1144 merge.verbosity
1145 </dt>
1146 <dd>
1147 <p>
1148 Controls the amount of output shown by the recursive merge
1149 strategy. Level 0 outputs nothing except a final error
1150 message if conflicts were detected. Level 1 outputs only
1152 above outputs debugging information. The default is level 2.
1154 </p>
1155 </dd>
1158 </dt>
1159 <dd>
1160 <p>
1161 Defines a human-readable name for a custom low-level
1163 </p>
1164 </dd>
1167 </dt>
1168 <dd>
1169 <p>
1170 Defines the command that implements a custom low-level
1172 </p>
1173 </dd>
1176 </dt>
1177 <dd>
1178 <p>
1179 Names a low-level merge driver to be used when
1180 performing an internal merge between common ancestors.
1182 </p>
1183 </dd>
1186 </dt>
1187 <dd>
1188 <p>
1191 values containing whitespace characters are currently not supported.
1192 </p>
1193 </dd>
1194 </dl></div>
1195 </div>
1198 <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>,
1204 </div>
1207 <div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>></p></div>
1208 </div>
1211 <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>
1212 </div>
1216 </div>
1220 </div>
1221 </div>
1222 </body>
1223 </html>