| blob | 1c2bfe537c4cf309dacc61b758228eaeb29415af |
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. Implies --no-progress.
609 </p>
610 </dd>
612 -v
613 </dt>
615 --verbose
616 </dt>
617 <dd>
618 <p>
619 Be verbose.
620 </p>
621 </dd>
623 --progress
624 </dt>
626 --no-progress
627 </dt>
628 <dd>
629 <p>
630 Turn progress on/off explicitly. If neither is specified,
631 progress is shown if standard error is connected to a terminal.
632 Note that not all merge strategies may support progress
633 reporting.
634 </p>
635 </dd>
638 </dt>
639 <dd>
640 <p>
641 Set the commit message to be used for the merge commit (in
642 case one is created).
643 </p>
644 <div class="paragraph"><p>If <tt>--log</tt> is specified, a shortlog of the commits being merged
645 will be appended to the specified message.</p></div>
648 invocations.</p></div>
649 </dd>
651 --rerere-autoupdate
652 </dt>
654 --no-rerere-autoupdate
655 </dt>
656 <dd>
657 <p>
658 Allow the rerere mechanism to update the index with the
659 result of auto-conflict resolution if possible.
660 </p>
661 </dd>
663 --abort
664 </dt>
665 <dd>
666 <p>
667 Abort the current conflict resolution process, and
668 try to reconstruct the pre-merge state.
669 </p>
672 reconstruct these changes. It is therefore recommended to always
674 <div class="paragraph"><p><em>git merge --abort</em> is equivalent to <em>git reset --merge</em> when
676 </dd>
679 </dt>
680 <dd>
681 <p>
682 Commits, usually other branch heads, to merge into our branch.
685 </p>
686 </dd>
687 </dl></div>
688 </div>
692 good shape and committed locally, so it will not be clobbered if
700 exception is when the changed index entries are in the state that
701 would result from the merge already.)</p></div>
702 <div class="paragraph"><p>If all named commits are already ancestors of <tt>HEAD</tt>, <em>git merge</em>
704 </div>
708 This is the most common case especially when invoked from <em>git
709 pull</em>: you are tracking an upstream repository, you have committed
710 no local changes, and now you want to update to a newer upstream
711 revision. In this case, a new commit is not needed to store the
713 updated to point at the named commit, without creating an extra
714 merge commit.</p></div>
715 <div class="paragraph"><p>This behavior can be suppressed with the <tt>--no-ff</tt> option.</p></div>
716 </div>
720 merged must be tied together by a merge commit that has both of them
721 as its parents.</p></div>
724 updated to it. It is possible to have modifications in the working
725 tree as long as they do not overlap; the update will preserve them.</p></div>
727 happens:</p></div>
729 <li>
730 <p>
732 </p>
733 </li>
734 <li>
735 <p>
737 </p>
738 </li>
739 <li>
740 <p>
741 Paths that merged cleanly are updated both in the index file and
742 in your working tree.
743 </p>
744 </li>
745 <li>
746 <p>
747 For conflicting paths, the index file records up to three
748 versions: stage 1 stores the version from the common ancestor,
752 merge results with familiar conflict markers <tt><<<</tt> <tt>===</tt> <tt>>>></tt>.
753 </p>
754 </li>
755 <li>
756 <p>
757 No other changes are made. In particular, the local
758 modifications you had before you started merge will stay the
759 same and the index entries for them stay as they were,
761 </p>
762 </li>
763 </ol></div>
766 </div>
769 <div class="paragraph"><p>During a merge, the working tree files are updated to reflect the result
770 of the merge. Among the changes made to the common ancestor’s version,
771 non-overlapping ones (that is, you changed an area of the file while the
772 other side left that area intact, or vice versa) are incorporated in the
773 final result verbatim. When both sides made changes to the same area,
774 however, git cannot randomly pick one side over the other, and asks you to
775 resolve it by leaving what both sides did to that area.</p></div>
776 <div class="paragraph"><p>By default, git uses the same style as that is used by "merge" program
777 from the RCS suite to present such a conflicted hunk, like this:</p></div>
780 <pre><tt>Here are lines that are either unchanged from the common
781 ancestor, or cleanly resolved because only one side changed.
782 <<<<<<< yours:sample.txt
783 Conflict resolution is hard;
784 let's go shopping.
785 =======
786 Git makes conflict resolution easy.
787 >>>>>>> theirs:sample.txt
788 And here is another line that is cleanly resolved or unmodified.</tt></pre>
789 </div></div>
790 <div class="paragraph"><p>The area where a pair of conflicting changes happened is marked with markers
791 <tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt>. The part before the <tt>=======</tt>
792 is typically your side, and the part afterwards is typically their side.</p></div>
793 <div class="paragraph"><p>The default format does not show what the original said in the conflicting
794 area. You cannot tell how many lines are deleted and replaced with
795 Barbie’s remark on your side. The only thing you can tell is that your
796 side wants to say it is hard and you’d prefer to go shopping, while the
797 other side wants to claim it is easy.</p></div>
800 may look like this:</p></div>
803 <pre><tt>Here are lines that are either unchanged from the common
804 ancestor, or cleanly resolved because only one side changed.
805 <<<<<<< yours:sample.txt
806 Conflict resolution is hard;
807 let's go shopping.
808 |||||||
809 Conflict resolution is hard.
810 =======
811 Git makes conflict resolution easy.
812 >>>>>>> theirs:sample.txt
813 And here is another line that is cleanly resolved or unmodified.</tt></pre>
814 </div></div>
815 <div class="paragraph"><p>In addition to the <tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt> markers, it uses
817 tell that the original just stated a fact, and your side simply gave in to
818 that statement and gave up, while the other side tried to have a more
819 positive attitude. You can sometimes come up with a better resolution by
820 viewing the original.</p></div>
821 </div>
826 <li>
827 <p>
828 Decide not to merge. The only clean-ups you need are to reset
831 can be used for this.
832 </p>
833 </li>
834 <li>
835 <p>
836 Resolve the conflicts. Git will mark the conflicts in
837 the working tree. Edit the files into shape and
839 </p>
840 </li>
841 </ul></div>
844 <li>
845 <p>
847 mergetool which will work you through the merge.
848 </p>
849 </li>
850 <li>
851 <p>
854 versions.
855 </p>
856 </li>
857 <li>
858 <p>
862 </p>
863 </li>
864 <li>
865 <p>
869 version.
870 </p>
871 </li>
872 </ul></div>
873 </div>
877 <li>
878 <p>
880 the current branch, making an octopus merge:
881 </p>
885 </div></div>
886 </li>
887 <li>
888 <p>
890 merge strategy:
891 </p>
895 </div></div>
896 </li>
897 <li>
898 <p>
900 a new commit automatically:
901 </p>
905 </div></div>
907 merge, or want to write your own merge commit message.</p></div>
909 changes into a merge commit. Small fixups like bumping
910 release/version name would be acceptable.</p></div>
911 </li>
912 </ul></div>
913 </div>
916 <div class="paragraph"><p>The merge mechanism (<em>git-merge</em> and <em>git-pull</em> commands) allows the
922 resolve
923 </dt>
924 <dd>
925 <p>
926 This can only resolve two heads (i.e. the current branch
927 and another branch you pulled from) using a 3-way merge
928 algorithm. It tries to carefully detect criss-cross
929 merge ambiguities and is considered generally safe and
930 fast.
931 </p>
932 </dd>
934 recursive
935 </dt>
936 <dd>
937 <p>
938 This can only resolve two heads using a 3-way merge
939 algorithm. When there is more than one common
940 ancestor that can be used for 3-way merge, it creates a
941 merged tree of the common ancestors and uses that as
942 the reference tree for the 3-way merge. This has been
943 reported to result in fewer merge conflicts without
944 causing mis-merges by tests done on actual merge commits
945 taken from Linux 2.6 kernel development history.
946 Additionally this can detect and handle merges involving
947 renames. This is the default merge strategy when
948 pulling or merging one branch.
949 </p>
950 <div class="paragraph"><p>The <em>recursive</em> strategy can take the following options:</p></div>
953 ours
954 </dt>
955 <dd>
956 <p>
957 This option forces conflicting hunks to be auto-resolved cleanly by
959 conflict with our side are reflected to the merge result.
960 </p>
961 <div class="paragraph"><p>This should not be confused with the <em>ours</em> merge strategy, which does not
962 even look at what the other tree contains at all. It discards everything
964 </dd>
966 theirs
967 </dt>
968 <dd>
969 <p>
971 </p>
972 </dd>
974 patience
975 </dt>
976 <dd>
977 <p>
979 to avoid mismerges that sometimes occur due to unimportant
980 matching lines (e.g., braces from distinct functions). Use
981 this when the branches to be merged have diverged wildly.
983 </p>
984 </dd>
986 ignore-space-change
987 </dt>
989 ignore-all-space
990 </dt>
992 ignore-space-at-eol
993 </dt>
994 <dd>
995 <p>
996 Treats lines with the indicated type of whitespace change as
997 unchanged for the sake of a three-way merge. Whitespace
998 changes mixed with other changes to a line are not ignored.
1001 </p>
1003 <li>
1004 <p>
1007 </p>
1008 </li>
1009 <li>
1010 <p>
1013 </p>
1014 </li>
1015 <li>
1016 <p>
1017 Otherwise, the merge proceeds in the usual way.
1018 </p>
1019 </li>
1020 </ul></div>
1021 </dd>
1023 renormalize
1024 </dt>
1025 <dd>
1026 <p>
1027 This runs a virtual check-out and check-in of all three stages
1028 of a file when resolving a three-way merge. This option is
1029 meant to be used when merging branches with different clean
1030 filters or end-of-line normalization rules. See "Merging
1031 branches with differing checkin/checkout attributes" in
1033 </p>
1034 </dd>
1036 no-renormalize
1037 </dt>
1038 <dd>
1039 <p>
1042 </p>
1043 </dd>
1046 </dt>
1047 <dd>
1048 <p>
1049 Controls the similarity threshold used for rename detection.
1051 </p>
1052 </dd>
1055 </dt>
1056 <dd>
1057 <p>
1059 the strategy makes a guess on how two trees must be shifted to
1060 match with each other when merging. Instead, the specified path
1061 is prefixed (or stripped from the beginning) to make the shape of
1062 two trees to match.
1063 </p>
1064 </dd>
1065 </dl></div>
1066 </dd>
1068 octopus
1069 </dt>
1070 <dd>
1071 <p>
1072 This resolves cases with more than two heads, but refuses to do
1073 a complex merge that needs manual resolution. It is
1074 primarily meant to be used for bundling topic branch
1075 heads together. This is the default merge strategy when
1076 pulling or merging more than one branch.
1077 </p>
1078 </dd>
1080 ours
1081 </dt>
1082 <dd>
1083 <p>
1084 This resolves any number of heads, but the resulting tree of the
1085 merge is always that of the current branch head, effectively
1086 ignoring all changes from all other branches. It is meant to
1087 be used to supersede old development history of side
1088 branches. Note that this is different from the -Xours option to
1090 </p>
1091 </dd>
1093 subtree
1094 </dt>
1095 <dd>
1096 <p>
1097 This is a modified recursive strategy. When merging trees A and
1098 B, if B corresponds to a subtree of A, B is first adjusted to
1099 match the tree structure of A, instead of reading the trees at
1100 the same level. This adjustment is also done to the common
1101 ancestor tree.
1102 </p>
1103 </dd>
1104 </dl></div>
1105 </div>
1110 merge.conflictstyle
1111 </dt>
1112 <dd>
1113 <p>
1114 Specify the style in which conflicted hunks are written out to
1115 working tree files upon merge. The default is "merge", which
1118 a <tt>>>>>>>></tt> marker. An alternate style, "diff3", adds a <tt>|||||||</tt>
1120 </p>
1121 </dd>
1123 merge.log
1124 </dt>
1125 <dd>
1126 <p>
1127 In addition to branch names, populate the log message with at
1128 most the specified number of one-line descriptions from the
1129 actual commits that are being merged. Defaults to false, and
1130 true is a synonym for 20.
1131 </p>
1132 </dd>
1134 merge.renameLimit
1135 </dt>
1136 <dd>
1137 <p>
1138 The number of files to consider when performing rename detection
1139 during a merge; if not specified, defaults to the value of
1140 diff.renameLimit.
1141 </p>
1142 </dd>
1144 merge.renormalize
1145 </dt>
1146 <dd>
1147 <p>
1148 Tell git that canonical representation of files in the
1149 repository has changed over time (e.g. earlier commits record
1150 text files with CRLF line endings, but recent ones use LF line
1151 endings). In such a repository, git can convert the data
1152 recorded in commits to a canonical form before performing a
1153 merge to reduce unnecessary conflicts. For more information,
1154 see section "Merging branches with differing checkin/checkout
1156 </p>
1157 </dd>
1159 merge.stat
1160 </dt>
1161 <dd>
1162 <p>
1163 Whether to print the diffstat between ORIG_HEAD and the merge result
1164 at the end of the merge. True by default.
1165 </p>
1166 </dd>
1168 merge.tool
1169 </dt>
1170 <dd>
1171 <p>
1172 Controls which merge resolution program is used by
1176 and "xxdiff". Any other value is treated is custom merge tool
1178 </p>
1179 </dd>
1181 merge.verbosity
1182 </dt>
1183 <dd>
1184 <p>
1185 Controls the amount of output shown by the recursive merge
1186 strategy. Level 0 outputs nothing except a final error
1187 message if conflicts were detected. Level 1 outputs only
1189 above outputs debugging information. The default is level 2.
1191 </p>
1192 </dd>
1195 </dt>
1196 <dd>
1197 <p>
1198 Defines a human-readable name for a custom low-level
1200 </p>
1201 </dd>
1204 </dt>
1205 <dd>
1206 <p>
1207 Defines the command that implements a custom low-level
1209 </p>
1210 </dd>
1213 </dt>
1214 <dd>
1215 <p>
1216 Names a low-level merge driver to be used when
1217 performing an internal merge between common ancestors.
1219 </p>
1220 </dd>
1223 </dt>
1224 <dd>
1225 <p>
1228 values containing whitespace characters are currently not supported.
1229 </p>
1230 </dd>
1231 </dl></div>
1232 </div>
1235 <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>,
1241 </div>
1245 </div>
1249 </div>
1250 </div>
1251 </body>
1252 </html>