| blob | a846835d0e4007f4a928ae2a51af85e7f6b587cb |
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>]
423 </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 Restore the original branch and abort the rebase operation.
662 </p>
663 </dd>
665 --skip
666 </dt>
667 <dd>
668 <p>
669 Restart the rebasing process by skipping the current patch.
670 </p>
671 </dd>
673 -m
674 </dt>
676 --merge
677 </dt>
678 <dd>
679 <p>
680 Use merging strategies to rebase. When the recursive (default) merge
681 strategy is used, this allows rebase to be aware of renames on the
682 upstream side.
683 </p>
684 <div class="paragraph"><p>Note that a rebase merge works by replaying each commit from the working
688 other words, the sides are swapped.</p></div>
689 </dd>
692 </dt>
695 </dt>
696 <dd>
697 <p>
698 Use the given merge strategy.
700 instead. This implies --merge.
701 </p>
702 <div class="paragraph"><p>Because <em>git rebase</em> replays each commit from the working branch
705 which makes little sense.</p></div>
706 </dd>
709 </dt>
712 </dt>
713 <dd>
714 <p>
719 </p>
720 </dd>
722 -q
723 </dt>
725 --quiet
726 </dt>
727 <dd>
728 <p>
729 Be quiet. Implies --no-stat.
730 </p>
731 </dd>
733 -v
734 </dt>
736 --verbose
737 </dt>
738 <dd>
739 <p>
740 Be verbose. Implies --stat.
741 </p>
742 </dd>
744 --stat
745 </dt>
746 <dd>
747 <p>
748 Show a diffstat of what changed upstream since the last rebase. The
749 diffstat is also controlled by the configuration option rebase.stat.
750 </p>
751 </dd>
753 -n
754 </dt>
756 --no-stat
757 </dt>
758 <dd>
759 <p>
760 Do not show a diffstat as part of the rebase process.
761 </p>
762 </dd>
764 --no-verify
765 </dt>
766 <dd>
767 <p>
769 </p>
770 </dd>
772 --verify
773 </dt>
774 <dd>
775 <p>
776 Allows the pre-rebase hook to run, which is the default. This option can
778 </p>
779 </dd>
782 </dt>
783 <dd>
784 <p>
786 and after each change. When fewer lines of surrounding
787 context exist they all must match. By default no context is
788 ever ignored.
789 </p>
790 </dd>
792 -f
793 </dt>
795 --force-rebase
796 </dt>
797 <dd>
798 <p>
799 Force the rebase even if the current branch is a descendant
800 of the commit you are rebasing onto. Normally non-interactive rebase will
801 exit with the message "Current branch is up to date" in such a
802 situation.
803 Incompatible with the --interactive option.
804 </p>
805 <div class="paragraph"><p>You may find this (or --no-ff with an interactive rebase) helpful after
806 reverting a topic branch merge, as this option recreates the topic branch with
807 fresh commits so it can be remerged successfully without needing to "revert
808 the reversion" (see the
809 <a href="howto/revert-a-faulty-merge.txt">revert-a-faulty-merge How-To</a> for details).</p></div>
810 </dd>
812 --ignore-whitespace
813 </dt>
816 </dt>
817 <dd>
818 <p>
821 Incompatible with the --interactive option.
822 </p>
823 </dd>
825 --committer-date-is-author-date
826 </dt>
828 --ignore-date
829 </dt>
830 <dd>
831 <p>
834 Incompatible with the --interactive option.
835 </p>
836 </dd>
838 -i
839 </dt>
841 --interactive
842 </dt>
843 <dd>
844 <p>
845 Make a list of the commits which are about to be rebased. Let the
846 user edit that list before rebasing. This mode can also be used to
847 split commits (see SPLITTING COMMITS below).
848 </p>
849 </dd>
851 -p
852 </dt>
854 --preserve-merges
855 </dt>
856 <dd>
857 <p>
858 Instead of ignoring merges, try to recreate them.
859 </p>
860 <div class="paragraph"><p>This uses the <tt>--interactive</tt> machinery internally, but combining it
862 idea unless you know what you are doing (see BUGS below).</p></div>
863 </dd>
865 --root
866 </dt>
867 <dd>
868 <p>
871 the root commit(s) on a branch. Must be used with --onto, and
875 instead.
876 </p>
877 </dd>
879 --autosquash
880 </dt>
882 --no-autosquash
883 </dt>
884 <dd>
885 <p>
886 When the commit log message begins with "squash! …" (or
887 "fixup! …"), and there is a commit whose title begins with
888 the same …, automatically modify the todo list of rebase -i
889 so that the commit marked for squashing comes right after the
890 commit to be modified, and change the action of the moved
892 </p>
893 <div class="paragraph"><p>This option is only valid when the <em>--interactive</em> option is used.</p></div>
896 used to override and disable this setting.</p></div>
897 </dd>
899 --no-ff
900 </dt>
901 <dd>
902 <p>
903 With --interactive, cherry-pick all rebased commits instead of
904 fast-forwarding over the unchanged ones. This ensures that the
905 entire history of the rebased branch is composed of new commits.
906 </p>
907 <div class="paragraph"><p>Without --interactive, this is a synonym for --force-rebase.</p></div>
908 <div class="paragraph"><p>You may find this helpful after reverting a topic branch merge, as this option
909 recreates the topic branch with fresh commits so it can be remerged
910 successfully without needing to "revert the reversion" (see the
911 <a href="howto/revert-a-faulty-merge.txt">revert-a-faulty-merge How-To</a> for details).</p></div>
912 </dd>
913 </dl></div>
914 </div>
917 <div class="paragraph"><p>The merge mechanism (<em>git-merge</em> and <em>git-pull</em> commands) allows the
923 resolve
924 </dt>
925 <dd>
926 <p>
927 This can only resolve two heads (i.e. the current branch
928 and another branch you pulled from) using a 3-way merge
929 algorithm. It tries to carefully detect criss-cross
930 merge ambiguities and is considered generally safe and
931 fast.
932 </p>
933 </dd>
935 recursive
936 </dt>
937 <dd>
938 <p>
939 This can only resolve two heads using a 3-way merge
940 algorithm. When there is more than one common
941 ancestor that can be used for 3-way merge, it creates a
942 merged tree of the common ancestors and uses that as
943 the reference tree for the 3-way merge. This has been
944 reported to result in fewer merge conflicts without
945 causing mis-merges by tests done on actual merge commits
946 taken from Linux 2.6 kernel development history.
947 Additionally this can detect and handle merges involving
948 renames. This is the default merge strategy when
949 pulling or merging one branch.
950 </p>
951 <div class="paragraph"><p>The <em>recursive</em> strategy can take the following options:</p></div>
954 ours
955 </dt>
956 <dd>
957 <p>
958 This option forces conflicting hunks to be auto-resolved cleanly by
960 conflict with our side are reflected to the merge result.
961 </p>
962 <div class="paragraph"><p>This should not be confused with the <em>ours</em> merge strategy, which does not
963 even look at what the other tree contains at all. It discards everything
965 </dd>
967 theirs
968 </dt>
969 <dd>
970 <p>
972 </p>
973 </dd>
975 patience
976 </dt>
977 <dd>
978 <p>
980 to avoid mismerges that sometimes occur due to unimportant
981 matching lines (e.g., braces from distinct functions). Use
982 this when the branches to be merged have diverged wildly.
984 </p>
985 </dd>
987 ignore-space-change
988 </dt>
990 ignore-all-space
991 </dt>
993 ignore-space-at-eol
994 </dt>
995 <dd>
996 <p>
997 Treats lines with the indicated type of whitespace change as
998 unchanged for the sake of a three-way merge. Whitespace
999 changes mixed with other changes to a line are not ignored.
1002 </p>
1004 <li>
1005 <p>
1008 </p>
1009 </li>
1010 <li>
1011 <p>
1014 </p>
1015 </li>
1016 <li>
1017 <p>
1018 Otherwise, the merge proceeds in the usual way.
1019 </p>
1020 </li>
1021 </ul></div>
1022 </dd>
1024 renormalize
1025 </dt>
1026 <dd>
1027 <p>
1028 This runs a virtual check-out and check-in of all three stages
1029 of a file when resolving a three-way merge. This option is
1030 meant to be used when merging branches with different clean
1031 filters or end-of-line normalization rules. See "Merging
1032 branches with differing checkin/checkout attributes" in
1034 </p>
1035 </dd>
1037 no-renormalize
1038 </dt>
1039 <dd>
1040 <p>
1043 </p>
1044 </dd>
1047 </dt>
1048 <dd>
1049 <p>
1050 Controls the similarity threshold used for rename detection.
1052 </p>
1053 </dd>
1056 </dt>
1057 <dd>
1058 <p>
1060 the strategy makes a guess on how two trees must be shifted to
1061 match with each other when merging. Instead, the specified path
1062 is prefixed (or stripped from the beginning) to make the shape of
1063 two trees to match.
1064 </p>
1065 </dd>
1066 </dl></div>
1067 </dd>
1069 octopus
1070 </dt>
1071 <dd>
1072 <p>
1073 This resolves cases with more than two heads, but refuses to do
1074 a complex merge that needs manual resolution. It is
1075 primarily meant to be used for bundling topic branch
1076 heads together. This is the default merge strategy when
1077 pulling or merging more than one branch.
1078 </p>
1079 </dd>
1081 ours
1082 </dt>
1083 <dd>
1084 <p>
1085 This resolves any number of heads, but the resulting tree of the
1086 merge is always that of the current branch head, effectively
1087 ignoring all changes from all other branches. It is meant to
1088 be used to supersede old development history of side
1089 branches. Note that this is different from the -Xours option to
1091 </p>
1092 </dd>
1094 subtree
1095 </dt>
1096 <dd>
1097 <p>
1098 This is a modified recursive strategy. When merging trees A and
1099 B, if B corresponds to a subtree of A, B is first adjusted to
1100 match the tree structure of A, instead of reading the trees at
1101 the same level. This adjustment is also done to the common
1102 ancestor tree.
1103 </p>
1104 </dd>
1105 </dl></div>
1106 </div>
1109 <div class="paragraph"><p>You should understand the implications of using <em>git rebase</em> on a
1110 repository that you share. See also RECOVERING FROM UPSTREAM REBASE
1111 below.</p></div>
1112 <div class="paragraph"><p>When the git-rebase command is run, it will first execute a "pre-rebase"
1113 hook if one exists. You can use this hook to do sanity checks and
1114 reject the rebase if it isn’t appropriate. Please see the template
1115 pre-rebase hook script for an example.</p></div>
1116 <div class="paragraph"><p>Upon completion, <branch> will be the current branch.</p></div>
1117 </div>
1120 <div class="paragraph"><p>Rebasing interactively means that you have a chance to edit the commits
1121 which are rebased. You can reorder the commits, and you can
1122 remove them (weeding out bad or otherwise unwanted patches).</p></div>
1125 <li>
1126 <p>
1127 have a wonderful idea
1128 </p>
1129 </li>
1130 <li>
1131 <p>
1132 hack on the code
1133 </p>
1134 </li>
1135 <li>
1136 <p>
1137 prepare a series for submission
1138 </p>
1139 </li>
1140 <li>
1141 <p>
1142 submit
1143 </p>
1144 </li>
1145 </ol></div>
1148 <li>
1149 <p>
1150 regular use
1151 </p>
1153 <li>
1154 <p>
1155 finish something worthy of a commit
1156 </p>
1157 </li>
1158 <li>
1159 <p>
1160 commit
1161 </p>
1162 </li>
1163 </ol></div>
1164 </li>
1165 <li>
1166 <p>
1167 independent fixup
1168 </p>
1170 <li>
1171 <p>
1172 realize that something does not work
1173 </p>
1174 </li>
1175 <li>
1176 <p>
1177 fix that
1178 </p>
1179 </li>
1180 <li>
1181 <p>
1182 commit it
1183 </p>
1184 </li>
1185 </ol></div>
1186 </li>
1187 </ol></div>
1189 perfect commit it fixes, because that commit is buried deeply in a
1190 patch series. That is exactly what interactive rebase is for: use it
1192 commits, and squashing multiple commits into one.</p></div>
1197 </div></div>
1198 <div class="paragraph"><p>An editor will be fired up with all the commits in your current branch
1199 (ignoring merge commits), which come after the given commit. You can
1200 reorder the commits in this list to your heart’s content, and you can
1201 remove them. The list looks more or less like this:</p></div>
1204 <pre><tt>pick deadbee The oneline of this commit
1205 pick fa1afe1 The oneline of the next commit
1206 ...</tt></pre>
1207 </div></div>
1208 <div class="paragraph"><p>The oneline descriptions are purely for your pleasure; <em>git rebase</em> will
1210 example), so do not delete or edit the names.</p></div>
1211 <div class="paragraph"><p>By replacing the command "pick" with the command "edit", you can tell
1213 the files and/or the commit message, amend the commit, and continue
1214 rebasing.</p></div>
1215 <div class="paragraph"><p>If you just want to edit the commit message for a commit, replace the
1217 <div class="paragraph"><p>If you want to fold two or more commits into one, replace the command
1219 If the commits had different authors, the folded commit will be
1220 attributed to the author of the first commit. The suggested commit
1221 message for the folded commit is the concatenation of the commit
1222 messages of the first commit and of those with the "squash" command,
1224 <div class="paragraph"><p><em>git rebase</em> will stop when "pick" has been replaced with "edit" or
1225 when a command fails due to merge errors. When you are done editing
1227 <div class="paragraph"><p>For example, if you want to reorder the last 5 commits, such that what
1228 was HEAD~4 becomes the new HEAD. To achieve that, you would call
1233 </div></div>
1235 <div class="paragraph"><p>You might want to preserve merges, if you have a history like this:</p></div>
1238 <pre><tt> X
1239 \
1240 A---M---B
1241 /
1242 ---o---O---P---Q</tt></pre>
1243 </div></div>
1244 <div class="paragraph"><p>Suppose you want to rebase the side branch starting at "A" to "Q". Make
1249 </div></div>
1251 steps. You may want to check that your history editing did not break
1252 anything by running a test, or at least recompiling at intermediate
1254 do so by creating a todo list like this one:</p></div>
1257 <pre><tt>pick deadbee Implement feature XXX
1258 fixup f1a5c00 Fix to feature XXX
1259 exec make
1260 pick c0ffeee The oneline of the next commit
1261 edit deadbab The oneline of the commit after
1262 exec cd subdir; make test
1263 ...</tt></pre>
1264 </div></div>
1265 <div class="paragraph"><p>The interactive rebase will stop when a command fails (i.e. exits with
1266 non-0 status) to give you an opportunity to fix the problem. You can
1268 <div class="paragraph"><p>The "exec" command launches the command in a shell (the one specified
1271 the root of the working tree.</p></div>
1272 </div>
1275 <div class="paragraph"><p>In interactive mode, you can mark commits with the action "edit". However,
1277 edit to be exactly one commit. Indeed, you can undo the commit, or you can
1278 add other commits. This can be used to split a commit into two:</p></div>
1280 <li>
1281 <p>
1284 will do, as long as it contains that commit.
1285 </p>
1286 </li>
1287 <li>
1288 <p>
1289 Mark the commit you want to split with the action "edit".
1290 </p>
1291 </li>
1292 <li>
1293 <p>
1295 effect is that the HEAD is rewound by one, and the index follows suit.
1296 However, the working tree stays the same.
1297 </p>
1298 </li>
1299 <li>
1300 <p>
1301 Now add the changes to the index that you want to have in the first
1304 </p>
1305 </li>
1306 <li>
1307 <p>
1308 Commit the now-current index with whatever commit message is appropriate
1309 now.
1310 </p>
1311 </li>
1312 <li>
1313 <p>
1314 Repeat the last two steps until your working tree is clean.
1315 </p>
1316 </li>
1317 <li>
1318 <p>
1320 </p>
1321 </li>
1322 </ul></div>
1324 consistent (they compile, pass the testsuite, etc.) you should use
1326 after each commit, test, and amend the commit if fixes are necessary.</p></div>
1327 </div>
1331 based work on is a bad idea: anyone downstream of it is forced to
1332 manually fix their history. This section explains how to do the fix
1333 from the downstream’s point of view. The real fix, however, would be
1334 to avoid rebasing the upstream in the first place.</p></div>
1335 <div class="paragraph"><p>To illustrate, suppose you are in a situation where someone develops a
1338 following:</p></div>
1341 <pre><tt> o---o---o---o---o---o---o---o---o master
1342 \
1343 o---o---o---o---o subsystem
1344 \
1345 *---*---* topic</tt></pre>
1346 </div></div>
1347 <div class="paragraph"><p>If <em>subsystem</em> is rebased against <em>master</em>, the following happens:</p></div>
1350 <pre><tt> o---o---o---o---o---o---o---o master
1351 \ \
1352 o---o---o---o---o o'--o'--o'--o'--o' subsystem
1353 \
1354 *---*---* topic</tt></pre>
1355 </div></div>
1356 <div class="paragraph"><p>If you now continue development as usual, and eventually merge <em>topic</em>
1357 to <em>subsystem</em>, the commits from <em>subsystem</em> will remain duplicated forever:</p></div>
1360 <pre><tt> o---o---o---o---o---o---o---o master
1361 \ \
1362 o---o---o---o---o o'--o'--o'--o'--o'--M subsystem
1363 \ /
1364 *---*---*-..........-*--* topic</tt></pre>
1365 </div></div>
1367 history, making it harder to follow. To clean things up, you need to
1371 <div class="paragraph"><p>There are two kinds of fixes, discussed in the following subsections:</p></div>
1374 Easy case: The changes are literally the same.
1375 </dt>
1376 <dd>
1377 <p>
1379 had no conflicts.
1380 </p>
1381 </dd>
1383 Hard case: The changes are not the same.
1384 </dt>
1385 <dd>
1386 <p>
1391 </p>
1392 </dd>
1393 </dl></div>
1398 <div class="paragraph"><p>In that case, the fix is easy because <em>git rebase</em> knows to skip
1399 changes that are already present in the new upstream. So if you say
1404 </div></div>
1408 <pre><tt> o---o---o---o---o---o---o---o master
1409 \
1410 o'--o'--o'--o'--o' subsystem
1411 \
1412 *---*---* topic</tt></pre>
1413 </div></div>
1415 <div class="paragraph"><p>Things get more complicated if the <em>subsystem</em> changes do not exactly
1416 correspond to the ones before the rebase.</p></div>
1418 <table><tr>
1421 </td>
1423 even in the hard case, it may have unintended consequences. For
1424 example, a commit that was removed via <tt>git rebase
1426 </tr></table>
1427 </div>
1428 <div class="paragraph"><p>The idea is to manually tell <em>git rebase</em> "where the old <em>subsystem</em>
1429 ended and your <em>topic</em> began", that is, what the old merge-base
1430 between them was. You will have to find a way to name the last commit
1433 <li>
1434 <p>
1438 </p>
1439 </li>
1440 <li>
1441 <p>
1444 </p>
1445 </li>
1446 </ul></div>
1447 <div class="paragraph"><p>You can then transplant the old <tt>subsystem..topic</tt> to the new tip by
1452 </div></div>
1456 </div>
1459 <div class="paragraph"><p>The todo list presented by <tt>--preserve-merges --interactive</tt> does not
1460 represent the topology of the revision graph. Editing commits and
1461 rewording their commit messages should work fine, but attempts to
1462 reorder commits tend to produce counterintuitive results.</p></div>
1467 </div></div>
1472 </div></div>
1473 <div class="paragraph"><p>by moving the "pick 4" line will result in the following history:</p></div>
1477 /
1479 </div></div>
1480 </div>
1484 </div>
1488 </div>
1489 </div>
1490 </body>
1491 </html>