| blob | 8f9b10afc8289c536798a959985a988f215eb945 |
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-rebase(1) Manual Page
407 </h1>
410 <p>git-rebase -
411 Forward-port local commits to the updated upstream head
412 </p>
413 </div>
414 </div>
418 <div class="verseblock-content"><em>git rebase</em> [-i | --interactive] [options] [--onto <newbase>]
424 </div></div>
425 </div>
428 <div class="paragraph"><p>If <branch> is specified, <em>git rebase</em> will perform an automatic
430 it remains on the current branch.</p></div>
434 branch or if the current branch does not have a configured upstream,
435 the rebase will abort.</p></div>
440 <div class="paragraph"><p>The current branch is reset to <upstream>, or <newbase> if the
441 --onto option was supplied. This has the exact same effect as
443 to point at the tip of the branch before the reset.</p></div>
445 then reapplied to the current branch, one by one, in order. Note that
446 any commits in HEAD which introduce the same textual changes as a commit
448 with a different commit message or timestamp will be skipped).</p></div>
449 <div class="paragraph"><p>It is possible that a merge failure will prevent this process from being
450 completely automatic. You will have to resolve any such merge failure
455 <div class="paragraph"><p>Assume the following history exists and the current branch is "topic":</p></div>
458 <pre><tt> A---B---C topic
459 /
460 D---E---F---G master</tt></pre>
461 </div></div>
462 <div class="paragraph"><p>From this point, the result of either of the following commands:</p></div>
465 <pre><tt>git rebase master
466 git rebase master topic</tt></pre>
467 </div></div>
471 <pre><tt> A'--B'--C' topic
472 /
473 D---E---F---G master</tt></pre>
474 </div></div>
475 <div class="paragraph"><p><strong>NOTE:</strong> The latter form is just a short-hand of <tt>git checkout topic</tt>
477 remain the checked-out branch.</p></div>
479 because you mailed a patch which was applied upstream), then that commit
480 will be skipped. For example, running ‘git rebase master` on the
481 following history (in which A’ and A introduce the same set of changes,
482 but have different committer information):</p></div>
485 <pre><tt> A---B---C topic
486 /
487 D---E---A'---F master</tt></pre>
488 </div></div>
492 <pre><tt> B'---C' topic
493 /
494 D---E---A'---F master</tt></pre>
495 </div></div>
497 branch to another, to pretend that you forked the topic branch
499 <div class="paragraph"><p>First let’s assume your <em>topic</em> is based on branch <em>next</em>.
504 <pre><tt> o---o---o---o---o master
505 \
506 o---o---o---o---o next
507 \
508 o---o---o topic</tt></pre>
509 </div></div>
510 <div class="paragraph"><p>We want to make <em>topic</em> forked from branch <em>master</em>; for example,
515 <pre><tt> o---o---o---o---o master
516 | \
517 | o'--o'--o' topic
518 \
519 o---o---o---o---o next</tt></pre>
520 </div></div>
525 </div></div>
527 branch. If we have the following situation:</p></div>
530 <pre><tt> H---I---J topicB
531 /
532 E---F---G topicA
533 /
534 A---B---C---D master</tt></pre>
535 </div></div>
540 </div></div>
544 <pre><tt> H'--I'--J' topicB
545 /
546 | E---F---G topicA
547 |/
548 A---B---C---D master</tt></pre>
549 </div></div>
552 the following situation:</p></div>
556 </div></div>
561 </div></div>
566 </div></div>
569 parameter can be any valid commit-ish.</p></div>
570 <div class="paragraph"><p>In case of conflict, <em>git rebase</em> will stop at the first problematic commit
572 the markers (<<<<<<) and make edits to resolve the conflict. For each
573 file you edit, you need to tell git that the conflict has been resolved,
574 typically this would be done with</p></div>
578 </div></div>
580 desired resolution, you can continue the rebasing process with</p></div>
584 </div></div>
589 </div></div>
590 </div>
595 rebase.stat
596 </dt>
597 <dd>
598 <p>
599 Whether to show a diffstat of what changed upstream since the last
600 rebase. False by default.
601 </p>
602 </dd>
604 rebase.autosquash
605 </dt>
606 <dd>
607 <p>
609 </p>
610 </dd>
611 </dl></div>
612 </div>
618 </dt>
619 <dd>
620 <p>
621 Starting point at which to create the new commits. If the
622 --onto option is not specified, the starting point is
624 existing branch name.
625 </p>
627 merge base of A and B if there is exactly one merge base. You can
628 leave out at most one of A and B, in which case it defaults to HEAD.</p></div>
629 </dd>
632 </dt>
633 <dd>
634 <p>
635 Upstream branch to compare against. May be any valid commit,
636 not just an existing branch name. Defaults to the configured
637 upstream for the current branch.
638 </p>
639 </dd>
642 </dt>
643 <dd>
644 <p>
645 Working branch; defaults to HEAD.
646 </p>
647 </dd>
649 --continue
650 </dt>
651 <dd>
652 <p>
653 Restart the rebasing process after having resolved a merge conflict.
654 </p>
655 </dd>
657 --abort
658 </dt>
659 <dd>
660 <p>
661 Abort the rebase operation and reset HEAD to the original
664 will be reset to where it was when the rebase operation was
665 started.
666 </p>
667 </dd>
669 --skip
670 </dt>
671 <dd>
672 <p>
673 Restart the rebasing process by skipping the current patch.
674 </p>
675 </dd>
677 -m
678 </dt>
680 --merge
681 </dt>
682 <dd>
683 <p>
684 Use merging strategies to rebase. When the recursive (default) merge
685 strategy is used, this allows rebase to be aware of renames on the
686 upstream side.
687 </p>
688 <div class="paragraph"><p>Note that a rebase merge works by replaying each commit from the working
692 other words, the sides are swapped.</p></div>
693 </dd>
696 </dt>
699 </dt>
700 <dd>
701 <p>
702 Use the given merge strategy.
704 instead. This implies --merge.
705 </p>
706 <div class="paragraph"><p>Because <em>git rebase</em> replays each commit from the working branch
709 which makes little sense.</p></div>
710 </dd>
713 </dt>
716 </dt>
717 <dd>
718 <p>
723 </p>
724 </dd>
726 -q
727 </dt>
729 --quiet
730 </dt>
731 <dd>
732 <p>
733 Be quiet. Implies --no-stat.
734 </p>
735 </dd>
737 -v
738 </dt>
740 --verbose
741 </dt>
742 <dd>
743 <p>
744 Be verbose. Implies --stat.
745 </p>
746 </dd>
748 --stat
749 </dt>
750 <dd>
751 <p>
752 Show a diffstat of what changed upstream since the last rebase. The
753 diffstat is also controlled by the configuration option rebase.stat.
754 </p>
755 </dd>
757 -n
758 </dt>
760 --no-stat
761 </dt>
762 <dd>
763 <p>
764 Do not show a diffstat as part of the rebase process.
765 </p>
766 </dd>
768 --no-verify
769 </dt>
770 <dd>
771 <p>
773 </p>
774 </dd>
776 --verify
777 </dt>
778 <dd>
779 <p>
780 Allows the pre-rebase hook to run, which is the default. This option can
782 </p>
783 </dd>
786 </dt>
787 <dd>
788 <p>
790 and after each change. When fewer lines of surrounding
791 context exist they all must match. By default no context is
792 ever ignored.
793 </p>
794 </dd>
796 -f
797 </dt>
799 --force-rebase
800 </dt>
801 <dd>
802 <p>
803 Force the rebase even if the current branch is a descendant
804 of the commit you are rebasing onto. Normally non-interactive rebase will
805 exit with the message "Current branch is up to date" in such a
806 situation.
807 Incompatible with the --interactive option.
808 </p>
809 <div class="paragraph"><p>You may find this (or --no-ff with an interactive rebase) helpful after
810 reverting a topic branch merge, as this option recreates the topic branch with
811 fresh commits so it can be remerged successfully without needing to "revert
812 the reversion" (see the
813 <a href="howto/revert-a-faulty-merge.txt">revert-a-faulty-merge How-To</a> for details).</p></div>
814 </dd>
816 --ignore-whitespace
817 </dt>
820 </dt>
821 <dd>
822 <p>
825 Incompatible with the --interactive option.
826 </p>
827 </dd>
829 --committer-date-is-author-date
830 </dt>
832 --ignore-date
833 </dt>
834 <dd>
835 <p>
838 Incompatible with the --interactive option.
839 </p>
840 </dd>
842 -i
843 </dt>
845 --interactive
846 </dt>
847 <dd>
848 <p>
849 Make a list of the commits which are about to be rebased. Let the
850 user edit that list before rebasing. This mode can also be used to
851 split commits (see SPLITTING COMMITS below).
852 </p>
853 </dd>
855 -p
856 </dt>
858 --preserve-merges
859 </dt>
860 <dd>
861 <p>
862 Instead of ignoring merges, try to recreate them.
863 </p>
864 <div class="paragraph"><p>This uses the <tt>--interactive</tt> machinery internally, but combining it
866 idea unless you know what you are doing (see BUGS below).</p></div>
867 </dd>
869 --root
870 </dt>
871 <dd>
872 <p>
875 the root commit(s) on a branch. Must be used with --onto, and
879 instead.
880 </p>
881 </dd>
883 --autosquash
884 </dt>
886 --no-autosquash
887 </dt>
888 <dd>
889 <p>
890 When the commit log message begins with "squash! …" (or
891 "fixup! …"), and there is a commit whose title begins with
892 the same …, automatically modify the todo list of rebase -i
893 so that the commit marked for squashing comes right after the
894 commit to be modified, and change the action of the moved
896 </p>
897 <div class="paragraph"><p>This option is only valid when the <em>--interactive</em> option is used.</p></div>
900 used to override and disable this setting.</p></div>
901 </dd>
903 --no-ff
904 </dt>
905 <dd>
906 <p>
907 With --interactive, cherry-pick all rebased commits instead of
908 fast-forwarding over the unchanged ones. This ensures that the
909 entire history of the rebased branch is composed of new commits.
910 </p>
911 <div class="paragraph"><p>Without --interactive, this is a synonym for --force-rebase.</p></div>
912 <div class="paragraph"><p>You may find this helpful after reverting a topic branch merge, as this option
913 recreates the topic branch with fresh commits so it can be remerged
914 successfully without needing to "revert the reversion" (see the
915 <a href="howto/revert-a-faulty-merge.txt">revert-a-faulty-merge How-To</a> for details).</p></div>
916 </dd>
917 </dl></div>
918 </div>
921 <div class="paragraph"><p>The merge mechanism (<em>git-merge</em> and <em>git-pull</em> commands) allows the
927 resolve
928 </dt>
929 <dd>
930 <p>
931 This can only resolve two heads (i.e. the current branch
932 and another branch you pulled from) using a 3-way merge
933 algorithm. It tries to carefully detect criss-cross
934 merge ambiguities and is considered generally safe and
935 fast.
936 </p>
937 </dd>
939 recursive
940 </dt>
941 <dd>
942 <p>
943 This can only resolve two heads using a 3-way merge
944 algorithm. When there is more than one common
945 ancestor that can be used for 3-way merge, it creates a
946 merged tree of the common ancestors and uses that as
947 the reference tree for the 3-way merge. This has been
948 reported to result in fewer merge conflicts without
949 causing mis-merges by tests done on actual merge commits
950 taken from Linux 2.6 kernel development history.
951 Additionally this can detect and handle merges involving
952 renames. This is the default merge strategy when
953 pulling or merging one branch.
954 </p>
955 <div class="paragraph"><p>The <em>recursive</em> strategy can take the following options:</p></div>
958 ours
959 </dt>
960 <dd>
961 <p>
962 This option forces conflicting hunks to be auto-resolved cleanly by
964 conflict with our side are reflected to the merge result.
965 </p>
966 <div class="paragraph"><p>This should not be confused with the <em>ours</em> merge strategy, which does not
967 even look at what the other tree contains at all. It discards everything
969 </dd>
971 theirs
972 </dt>
973 <dd>
974 <p>
976 </p>
977 </dd>
979 patience
980 </dt>
981 <dd>
982 <p>
984 to avoid mismerges that sometimes occur due to unimportant
985 matching lines (e.g., braces from distinct functions). Use
986 this when the branches to be merged have diverged wildly.
988 </p>
989 </dd>
991 ignore-space-change
992 </dt>
994 ignore-all-space
995 </dt>
997 ignore-space-at-eol
998 </dt>
999 <dd>
1000 <p>
1001 Treats lines with the indicated type of whitespace change as
1002 unchanged for the sake of a three-way merge. Whitespace
1003 changes mixed with other changes to a line are not ignored.
1006 </p>
1008 <li>
1009 <p>
1012 </p>
1013 </li>
1014 <li>
1015 <p>
1018 </p>
1019 </li>
1020 <li>
1021 <p>
1022 Otherwise, the merge proceeds in the usual way.
1023 </p>
1024 </li>
1025 </ul></div>
1026 </dd>
1028 renormalize
1029 </dt>
1030 <dd>
1031 <p>
1032 This runs a virtual check-out and check-in of all three stages
1033 of a file when resolving a three-way merge. This option is
1034 meant to be used when merging branches with different clean
1035 filters or end-of-line normalization rules. See "Merging
1036 branches with differing checkin/checkout attributes" in
1038 </p>
1039 </dd>
1041 no-renormalize
1042 </dt>
1043 <dd>
1044 <p>
1047 </p>
1048 </dd>
1051 </dt>
1052 <dd>
1053 <p>
1054 Controls the similarity threshold used for rename detection.
1056 </p>
1057 </dd>
1060 </dt>
1061 <dd>
1062 <p>
1064 the strategy makes a guess on how two trees must be shifted to
1065 match with each other when merging. Instead, the specified path
1066 is prefixed (or stripped from the beginning) to make the shape of
1067 two trees to match.
1068 </p>
1069 </dd>
1070 </dl></div>
1071 </dd>
1073 octopus
1074 </dt>
1075 <dd>
1076 <p>
1077 This resolves cases with more than two heads, but refuses to do
1078 a complex merge that needs manual resolution. It is
1079 primarily meant to be used for bundling topic branch
1080 heads together. This is the default merge strategy when
1081 pulling or merging more than one branch.
1082 </p>
1083 </dd>
1085 ours
1086 </dt>
1087 <dd>
1088 <p>
1089 This resolves any number of heads, but the resulting tree of the
1090 merge is always that of the current branch head, effectively
1091 ignoring all changes from all other branches. It is meant to
1092 be used to supersede old development history of side
1093 branches. Note that this is different from the -Xours option to
1095 </p>
1096 </dd>
1098 subtree
1099 </dt>
1100 <dd>
1101 <p>
1102 This is a modified recursive strategy. When merging trees A and
1103 B, if B corresponds to a subtree of A, B is first adjusted to
1104 match the tree structure of A, instead of reading the trees at
1105 the same level. This adjustment is also done to the common
1106 ancestor tree.
1107 </p>
1108 </dd>
1109 </dl></div>
1110 </div>
1113 <div class="paragraph"><p>You should understand the implications of using <em>git rebase</em> on a
1114 repository that you share. See also RECOVERING FROM UPSTREAM REBASE
1115 below.</p></div>
1116 <div class="paragraph"><p>When the git-rebase command is run, it will first execute a "pre-rebase"
1117 hook if one exists. You can use this hook to do sanity checks and
1118 reject the rebase if it isn’t appropriate. Please see the template
1119 pre-rebase hook script for an example.</p></div>
1120 <div class="paragraph"><p>Upon completion, <branch> will be the current branch.</p></div>
1121 </div>
1124 <div class="paragraph"><p>Rebasing interactively means that you have a chance to edit the commits
1125 which are rebased. You can reorder the commits, and you can
1126 remove them (weeding out bad or otherwise unwanted patches).</p></div>
1129 <li>
1130 <p>
1131 have a wonderful idea
1132 </p>
1133 </li>
1134 <li>
1135 <p>
1136 hack on the code
1137 </p>
1138 </li>
1139 <li>
1140 <p>
1141 prepare a series for submission
1142 </p>
1143 </li>
1144 <li>
1145 <p>
1146 submit
1147 </p>
1148 </li>
1149 </ol></div>
1152 <li>
1153 <p>
1154 regular use
1155 </p>
1157 <li>
1158 <p>
1159 finish something worthy of a commit
1160 </p>
1161 </li>
1162 <li>
1163 <p>
1164 commit
1165 </p>
1166 </li>
1167 </ol></div>
1168 </li>
1169 <li>
1170 <p>
1171 independent fixup
1172 </p>
1174 <li>
1175 <p>
1176 realize that something does not work
1177 </p>
1178 </li>
1179 <li>
1180 <p>
1181 fix that
1182 </p>
1183 </li>
1184 <li>
1185 <p>
1186 commit it
1187 </p>
1188 </li>
1189 </ol></div>
1190 </li>
1191 </ol></div>
1193 perfect commit it fixes, because that commit is buried deeply in a
1194 patch series. That is exactly what interactive rebase is for: use it
1196 commits, and squashing multiple commits into one.</p></div>
1201 </div></div>
1202 <div class="paragraph"><p>An editor will be fired up with all the commits in your current branch
1203 (ignoring merge commits), which come after the given commit. You can
1204 reorder the commits in this list to your heart’s content, and you can
1205 remove them. The list looks more or less like this:</p></div>
1208 <pre><tt>pick deadbee The oneline of this commit
1209 pick fa1afe1 The oneline of the next commit
1210 ...</tt></pre>
1211 </div></div>
1212 <div class="paragraph"><p>The oneline descriptions are purely for your pleasure; <em>git rebase</em> will
1214 example), so do not delete or edit the names.</p></div>
1215 <div class="paragraph"><p>By replacing the command "pick" with the command "edit", you can tell
1217 the files and/or the commit message, amend the commit, and continue
1218 rebasing.</p></div>
1219 <div class="paragraph"><p>If you just want to edit the commit message for a commit, replace the
1221 <div class="paragraph"><p>If you want to fold two or more commits into one, replace the command
1223 If the commits had different authors, the folded commit will be
1224 attributed to the author of the first commit. The suggested commit
1225 message for the folded commit is the concatenation of the commit
1226 messages of the first commit and of those with the "squash" command,
1228 <div class="paragraph"><p><em>git rebase</em> will stop when "pick" has been replaced with "edit" or
1229 when a command fails due to merge errors. When you are done editing
1231 <div class="paragraph"><p>For example, if you want to reorder the last 5 commits, such that what
1232 was HEAD~4 becomes the new HEAD. To achieve that, you would call
1237 </div></div>
1239 <div class="paragraph"><p>You might want to preserve merges, if you have a history like this:</p></div>
1242 <pre><tt> X
1243 \
1244 A---M---B
1245 /
1246 ---o---O---P---Q</tt></pre>
1247 </div></div>
1248 <div class="paragraph"><p>Suppose you want to rebase the side branch starting at "A" to "Q". Make
1253 </div></div>
1255 steps. You may want to check that your history editing did not break
1256 anything by running a test, or at least recompiling at intermediate
1258 do so by creating a todo list like this one:</p></div>
1261 <pre><tt>pick deadbee Implement feature XXX
1262 fixup f1a5c00 Fix to feature XXX
1263 exec make
1264 pick c0ffeee The oneline of the next commit
1265 edit deadbab The oneline of the commit after
1266 exec cd subdir; make test
1267 ...</tt></pre>
1268 </div></div>
1269 <div class="paragraph"><p>The interactive rebase will stop when a command fails (i.e. exits with
1270 non-0 status) to give you an opportunity to fix the problem. You can
1272 <div class="paragraph"><p>The "exec" command launches the command in a shell (the one specified
1275 the root of the working tree.</p></div>
1276 </div>
1279 <div class="paragraph"><p>In interactive mode, you can mark commits with the action "edit". However,
1281 edit to be exactly one commit. Indeed, you can undo the commit, or you can
1282 add other commits. This can be used to split a commit into two:</p></div>
1284 <li>
1285 <p>
1288 will do, as long as it contains that commit.
1289 </p>
1290 </li>
1291 <li>
1292 <p>
1293 Mark the commit you want to split with the action "edit".
1294 </p>
1295 </li>
1296 <li>
1297 <p>
1299 effect is that the HEAD is rewound by one, and the index follows suit.
1300 However, the working tree stays the same.
1301 </p>
1302 </li>
1303 <li>
1304 <p>
1305 Now add the changes to the index that you want to have in the first
1308 </p>
1309 </li>
1310 <li>
1311 <p>
1312 Commit the now-current index with whatever commit message is appropriate
1313 now.
1314 </p>
1315 </li>
1316 <li>
1317 <p>
1318 Repeat the last two steps until your working tree is clean.
1319 </p>
1320 </li>
1321 <li>
1322 <p>
1324 </p>
1325 </li>
1326 </ul></div>
1328 consistent (they compile, pass the testsuite, etc.) you should use
1330 after each commit, test, and amend the commit if fixes are necessary.</p></div>
1331 </div>
1335 based work on is a bad idea: anyone downstream of it is forced to
1336 manually fix their history. This section explains how to do the fix
1337 from the downstream’s point of view. The real fix, however, would be
1338 to avoid rebasing the upstream in the first place.</p></div>
1339 <div class="paragraph"><p>To illustrate, suppose you are in a situation where someone develops a
1342 following:</p></div>
1345 <pre><tt> o---o---o---o---o---o---o---o---o master
1346 \
1347 o---o---o---o---o subsystem
1348 \
1349 *---*---* topic</tt></pre>
1350 </div></div>
1351 <div class="paragraph"><p>If <em>subsystem</em> is rebased against <em>master</em>, the following happens:</p></div>
1354 <pre><tt> o---o---o---o---o---o---o---o master
1355 \ \
1356 o---o---o---o---o o'--o'--o'--o'--o' subsystem
1357 \
1358 *---*---* topic</tt></pre>
1359 </div></div>
1360 <div class="paragraph"><p>If you now continue development as usual, and eventually merge <em>topic</em>
1361 to <em>subsystem</em>, the commits from <em>subsystem</em> will remain duplicated forever:</p></div>
1364 <pre><tt> o---o---o---o---o---o---o---o master
1365 \ \
1366 o---o---o---o---o o'--o'--o'--o'--o'--M subsystem
1367 \ /
1368 *---*---*-..........-*--* topic</tt></pre>
1369 </div></div>
1371 history, making it harder to follow. To clean things up, you need to
1375 <div class="paragraph"><p>There are two kinds of fixes, discussed in the following subsections:</p></div>
1378 Easy case: The changes are literally the same.
1379 </dt>
1380 <dd>
1381 <p>
1383 had no conflicts.
1384 </p>
1385 </dd>
1387 Hard case: The changes are not the same.
1388 </dt>
1389 <dd>
1390 <p>
1395 </p>
1396 </dd>
1397 </dl></div>
1402 <div class="paragraph"><p>In that case, the fix is easy because <em>git rebase</em> knows to skip
1403 changes that are already present in the new upstream. So if you say
1408 </div></div>
1412 <pre><tt> o---o---o---o---o---o---o---o master
1413 \
1414 o'--o'--o'--o'--o' subsystem
1415 \
1416 *---*---* topic</tt></pre>
1417 </div></div>
1419 <div class="paragraph"><p>Things get more complicated if the <em>subsystem</em> changes do not exactly
1420 correspond to the ones before the rebase.</p></div>
1422 <table><tr>
1425 </td>
1427 even in the hard case, it may have unintended consequences. For
1428 example, a commit that was removed via <tt>git rebase
1430 </tr></table>
1431 </div>
1432 <div class="paragraph"><p>The idea is to manually tell <em>git rebase</em> "where the old <em>subsystem</em>
1433 ended and your <em>topic</em> began", that is, what the old merge-base
1434 between them was. You will have to find a way to name the last commit
1437 <li>
1438 <p>
1442 </p>
1443 </li>
1444 <li>
1445 <p>
1448 </p>
1449 </li>
1450 </ul></div>
1451 <div class="paragraph"><p>You can then transplant the old <tt>subsystem..topic</tt> to the new tip by
1456 </div></div>
1460 </div>
1463 <div class="paragraph"><p>The todo list presented by <tt>--preserve-merges --interactive</tt> does not
1464 represent the topology of the revision graph. Editing commits and
1465 rewording their commit messages should work fine, but attempts to
1466 reorder commits tend to produce counterintuitive results.</p></div>
1471 </div></div>
1476 </div></div>
1477 <div class="paragraph"><p>by moving the "pick 4" line will result in the following history:</p></div>
1481 /
1483 </div></div>
1484 </div>
1488 </div>
1492 </div>
1493 </div>
1494 </body>
1495 </html>