| blob | 7226632ba6c95cab208af8772d5ca696e083efda |
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.
683 Specifying more than one commit will create a merge with
684 more than two parents (affectionately called an Octopus merge).
685 </p>
686 <div class="paragraph"><p>If no commit is given from the command line, and if <tt>merge.defaultToUpstream</tt>
687 configuration variable is set, merge the remote tracking branches
688 that the current branch is configured to use as its upstream.
689 See also the configuration section of this manual page.</p></div>
690 </dd>
691 </dl></div>
692 </div>
696 good shape and committed locally, so it will not be clobbered if
704 exception is when the changed index entries are in the state that
705 would result from the merge already.)</p></div>
706 <div class="paragraph"><p>If all named commits are already ancestors of <tt>HEAD</tt>, <em>git merge</em>
708 </div>
712 This is the most common case especially when invoked from <em>git
713 pull</em>: you are tracking an upstream repository, you have committed
714 no local changes, and now you want to update to a newer upstream
715 revision. In this case, a new commit is not needed to store the
717 updated to point at the named commit, without creating an extra
718 merge commit.</p></div>
719 <div class="paragraph"><p>This behavior can be suppressed with the <tt>--no-ff</tt> option.</p></div>
720 </div>
724 merged must be tied together by a merge commit that has both of them
725 as its parents.</p></div>
728 updated to it. It is possible to have modifications in the working
729 tree as long as they do not overlap; the update will preserve them.</p></div>
731 happens:</p></div>
733 <li>
734 <p>
736 </p>
737 </li>
738 <li>
739 <p>
741 </p>
742 </li>
743 <li>
744 <p>
745 Paths that merged cleanly are updated both in the index file and
746 in your working tree.
747 </p>
748 </li>
749 <li>
750 <p>
751 For conflicting paths, the index file records up to three
752 versions: stage 1 stores the version from the common ancestor,
756 merge results with familiar conflict markers <tt><<<</tt> <tt>===</tt> <tt>>>></tt>.
757 </p>
758 </li>
759 <li>
760 <p>
761 No other changes are made. In particular, the local
762 modifications you had before you started merge will stay the
763 same and the index entries for them stay as they were,
765 </p>
766 </li>
767 </ol></div>
770 </div>
773 <div class="paragraph"><p>During a merge, the working tree files are updated to reflect the result
774 of the merge. Among the changes made to the common ancestor’s version,
775 non-overlapping ones (that is, you changed an area of the file while the
776 other side left that area intact, or vice versa) are incorporated in the
777 final result verbatim. When both sides made changes to the same area,
778 however, git cannot randomly pick one side over the other, and asks you to
779 resolve it by leaving what both sides did to that area.</p></div>
780 <div class="paragraph"><p>By default, git uses the same style as that is used by "merge" program
781 from the RCS suite to present such a conflicted hunk, like this:</p></div>
784 <pre><tt>Here are lines that are either unchanged from the common
785 ancestor, or cleanly resolved because only one side changed.
786 <<<<<<< yours:sample.txt
787 Conflict resolution is hard;
788 let's go shopping.
789 =======
790 Git makes conflict resolution easy.
791 >>>>>>> theirs:sample.txt
792 And here is another line that is cleanly resolved or unmodified.</tt></pre>
793 </div></div>
794 <div class="paragraph"><p>The area where a pair of conflicting changes happened is marked with markers
795 <tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt>. The part before the <tt>=======</tt>
796 is typically your side, and the part afterwards is typically their side.</p></div>
797 <div class="paragraph"><p>The default format does not show what the original said in the conflicting
798 area. You cannot tell how many lines are deleted and replaced with
799 Barbie’s remark on your side. The only thing you can tell is that your
800 side wants to say it is hard and you’d prefer to go shopping, while the
801 other side wants to claim it is easy.</p></div>
804 may look like this:</p></div>
807 <pre><tt>Here are lines that are either unchanged from the common
808 ancestor, or cleanly resolved because only one side changed.
809 <<<<<<< yours:sample.txt
810 Conflict resolution is hard;
811 let's go shopping.
812 |||||||
813 Conflict resolution is hard.
814 =======
815 Git makes conflict resolution easy.
816 >>>>>>> theirs:sample.txt
817 And here is another line that is cleanly resolved or unmodified.</tt></pre>
818 </div></div>
819 <div class="paragraph"><p>In addition to the <tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt> markers, it uses
821 tell that the original just stated a fact, and your side simply gave in to
822 that statement and gave up, while the other side tried to have a more
823 positive attitude. You can sometimes come up with a better resolution by
824 viewing the original.</p></div>
825 </div>
830 <li>
831 <p>
832 Decide not to merge. The only clean-ups you need are to reset
835 can be used for this.
836 </p>
837 </li>
838 <li>
839 <p>
840 Resolve the conflicts. Git will mark the conflicts in
841 the working tree. Edit the files into shape and
843 </p>
844 </li>
845 </ul></div>
848 <li>
849 <p>
851 mergetool which will work you through the merge.
852 </p>
853 </li>
854 <li>
855 <p>
858 versions.
859 </p>
860 </li>
861 <li>
862 <p>
866 </p>
867 </li>
868 <li>
869 <p>
873 version.
874 </p>
875 </li>
876 </ul></div>
877 </div>
881 <li>
882 <p>
884 the current branch, making an octopus merge:
885 </p>
889 </div></div>
890 </li>
891 <li>
892 <p>
894 merge strategy:
895 </p>
899 </div></div>
900 </li>
901 <li>
902 <p>
904 a new commit automatically:
905 </p>
909 </div></div>
911 merge, or want to write your own merge commit message.</p></div>
913 changes into a merge commit. Small fixups like bumping
914 release/version name would be acceptable.</p></div>
915 </li>
916 </ul></div>
917 </div>
920 <div class="paragraph"><p>The merge mechanism (<em>git-merge</em> and <em>git-pull</em> commands) allows the
926 resolve
927 </dt>
928 <dd>
929 <p>
930 This can only resolve two heads (i.e. the current branch
931 and another branch you pulled from) using a 3-way merge
932 algorithm. It tries to carefully detect criss-cross
933 merge ambiguities and is considered generally safe and
934 fast.
935 </p>
936 </dd>
938 recursive
939 </dt>
940 <dd>
941 <p>
942 This can only resolve two heads using a 3-way merge
943 algorithm. When there is more than one common
944 ancestor that can be used for 3-way merge, it creates a
945 merged tree of the common ancestors and uses that as
946 the reference tree for the 3-way merge. This has been
947 reported to result in fewer merge conflicts without
948 causing mis-merges by tests done on actual merge commits
949 taken from Linux 2.6 kernel development history.
950 Additionally this can detect and handle merges involving
951 renames. This is the default merge strategy when
952 pulling or merging one branch.
953 </p>
954 <div class="paragraph"><p>The <em>recursive</em> strategy can take the following options:</p></div>
957 ours
958 </dt>
959 <dd>
960 <p>
961 This option forces conflicting hunks to be auto-resolved cleanly by
963 conflict with our side are reflected to the merge result.
964 </p>
965 <div class="paragraph"><p>This should not be confused with the <em>ours</em> merge strategy, which does not
966 even look at what the other tree contains at all. It discards everything
968 </dd>
970 theirs
971 </dt>
972 <dd>
973 <p>
975 </p>
976 </dd>
978 patience
979 </dt>
980 <dd>
981 <p>
983 to avoid mismerges that sometimes occur due to unimportant
984 matching lines (e.g., braces from distinct functions). Use
985 this when the branches to be merged have diverged wildly.
987 </p>
988 </dd>
990 ignore-space-change
991 </dt>
993 ignore-all-space
994 </dt>
996 ignore-space-at-eol
997 </dt>
998 <dd>
999 <p>
1000 Treats lines with the indicated type of whitespace change as
1001 unchanged for the sake of a three-way merge. Whitespace
1002 changes mixed with other changes to a line are not ignored.
1005 </p>
1007 <li>
1008 <p>
1011 </p>
1012 </li>
1013 <li>
1014 <p>
1017 </p>
1018 </li>
1019 <li>
1020 <p>
1021 Otherwise, the merge proceeds in the usual way.
1022 </p>
1023 </li>
1024 </ul></div>
1025 </dd>
1027 renormalize
1028 </dt>
1029 <dd>
1030 <p>
1031 This runs a virtual check-out and check-in of all three stages
1032 of a file when resolving a three-way merge. This option is
1033 meant to be used when merging branches with different clean
1034 filters or end-of-line normalization rules. See "Merging
1035 branches with differing checkin/checkout attributes" in
1037 </p>
1038 </dd>
1040 no-renormalize
1041 </dt>
1042 <dd>
1043 <p>
1046 </p>
1047 </dd>
1050 </dt>
1051 <dd>
1052 <p>
1053 Controls the similarity threshold used for rename detection.
1055 </p>
1056 </dd>
1059 </dt>
1060 <dd>
1061 <p>
1063 the strategy makes a guess on how two trees must be shifted to
1064 match with each other when merging. Instead, the specified path
1065 is prefixed (or stripped from the beginning) to make the shape of
1066 two trees to match.
1067 </p>
1068 </dd>
1069 </dl></div>
1070 </dd>
1072 octopus
1073 </dt>
1074 <dd>
1075 <p>
1076 This resolves cases with more than two heads, but refuses to do
1077 a complex merge that needs manual resolution. It is
1078 primarily meant to be used for bundling topic branch
1079 heads together. This is the default merge strategy when
1080 pulling or merging more than one branch.
1081 </p>
1082 </dd>
1084 ours
1085 </dt>
1086 <dd>
1087 <p>
1088 This resolves any number of heads, but the resulting tree of the
1089 merge is always that of the current branch head, effectively
1090 ignoring all changes from all other branches. It is meant to
1091 be used to supersede old development history of side
1092 branches. Note that this is different from the -Xours option to
1094 </p>
1095 </dd>
1097 subtree
1098 </dt>
1099 <dd>
1100 <p>
1101 This is a modified recursive strategy. When merging trees A and
1102 B, if B corresponds to a subtree of A, B is first adjusted to
1103 match the tree structure of A, instead of reading the trees at
1104 the same level. This adjustment is also done to the common
1105 ancestor tree.
1106 </p>
1107 </dd>
1108 </dl></div>
1109 </div>
1114 merge.conflictstyle
1115 </dt>
1116 <dd>
1117 <p>
1118 Specify the style in which conflicted hunks are written out to
1119 working tree files upon merge. The default is "merge", which
1122 a <tt>>>>>>>></tt> marker. An alternate style, "diff3", adds a <tt>|||||||</tt>
1124 </p>
1125 </dd>
1127 merge.defaultToUpstream
1128 </dt>
1129 <dd>
1130 <p>
1131 If merge is called without any commit argument, merge the upstream
1132 branches configured for the current branch by using their last
1133 observed values stored in their remote tracking branches.
1137 to their corresponding remote tracking branches, and the tips of
1138 these tracking branches are merged.
1139 </p>
1140 </dd>
1142 merge.ff
1143 </dt>
1144 <dd>
1145 <p>
1146 By default, git does not create an extra merge commit when merging
1147 a commit that is a descendant of the current commit. Instead, the
1149 this variable tells git to create an extra merge commit in such
1153 command line).
1154 </p>
1155 </dd>
1157 merge.log
1158 </dt>
1159 <dd>
1160 <p>
1161 In addition to branch names, populate the log message with at
1162 most the specified number of one-line descriptions from the
1163 actual commits that are being merged. Defaults to false, and
1164 true is a synonym for 20.
1165 </p>
1166 </dd>
1168 merge.renameLimit
1169 </dt>
1170 <dd>
1171 <p>
1172 The number of files to consider when performing rename detection
1173 during a merge; if not specified, defaults to the value of
1174 diff.renameLimit.
1175 </p>
1176 </dd>
1178 merge.renormalize
1179 </dt>
1180 <dd>
1181 <p>
1182 Tell git that canonical representation of files in the
1183 repository has changed over time (e.g. earlier commits record
1184 text files with CRLF line endings, but recent ones use LF line
1185 endings). In such a repository, git can convert the data
1186 recorded in commits to a canonical form before performing a
1187 merge to reduce unnecessary conflicts. For more information,
1188 see section "Merging branches with differing checkin/checkout
1190 </p>
1191 </dd>
1193 merge.stat
1194 </dt>
1195 <dd>
1196 <p>
1197 Whether to print the diffstat between ORIG_HEAD and the merge result
1198 at the end of the merge. True by default.
1199 </p>
1200 </dd>
1202 merge.tool
1203 </dt>
1204 <dd>
1205 <p>
1206 Controls which merge resolution program is used by
1210 and "xxdiff". Any other value is treated is custom merge tool
1212 </p>
1213 </dd>
1215 merge.verbosity
1216 </dt>
1217 <dd>
1218 <p>
1219 Controls the amount of output shown by the recursive merge
1220 strategy. Level 0 outputs nothing except a final error
1221 message if conflicts were detected. Level 1 outputs only
1223 above outputs debugging information. The default is level 2.
1225 </p>
1226 </dd>
1229 </dt>
1230 <dd>
1231 <p>
1232 Defines a human-readable name for a custom low-level
1234 </p>
1235 </dd>
1238 </dt>
1239 <dd>
1240 <p>
1241 Defines the command that implements a custom low-level
1243 </p>
1244 </dd>
1247 </dt>
1248 <dd>
1249 <p>
1250 Names a low-level merge driver to be used when
1251 performing an internal merge between common ancestors.
1253 </p>
1254 </dd>
1257 </dt>
1258 <dd>
1259 <p>
1262 values containing whitespace characters are currently not supported.
1263 </p>
1264 </dd>
1265 </dl></div>
1266 </div>
1269 <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>,
1275 </div>
1279 </div>
1283 </div>
1284 </div>
1285 </body>
1286 </html>