| blob | 5b586fb6d5306bbeda103c8d6b231b466e4800a3 |
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>
435 <div class="paragraph"><p>The current branch is reset to <upstream>, or <newbase> if the
436 --onto option was supplied. This has the exact same effect as
438 to point at the tip of the branch before the reset.</p></div>
440 then reapplied to the current branch, one by one, in order. Note that
441 any commits in HEAD which introduce the same textual changes as a commit
443 with a different commit message or timestamp will be skipped).</p></div>
444 <div class="paragraph"><p>It is possible that a merge failure will prevent this process from being
445 completely automatic. You will have to resolve any such merge failure
450 <div class="paragraph"><p>Assume the following history exists and the current branch is "topic":</p></div>
453 <pre><tt> A---B---C topic
454 /
455 D---E---F---G master</tt></pre>
456 </div></div>
457 <div class="paragraph"><p>From this point, the result of either of the following commands:</p></div>
460 <pre><tt>git rebase master
461 git rebase master topic</tt></pre>
462 </div></div>
466 <pre><tt> A'--B'--C' topic
467 /
468 D---E---F---G master</tt></pre>
469 </div></div>
473 because you mailed a patch which was applied upstream), then that commit
474 will be skipped. For example, running ‘git rebase master` on the
475 following history (in which A’ and A introduce the same set of changes,
476 but have different committer information):</p></div>
479 <pre><tt> A---B---C topic
480 /
481 D---E---A'---F master</tt></pre>
482 </div></div>
486 <pre><tt> B'---C' topic
487 /
488 D---E---A'---F master</tt></pre>
489 </div></div>
491 branch to another, to pretend that you forked the topic branch
493 <div class="paragraph"><p>First let’s assume your <em>topic</em> is based on branch <em>next</em>.
498 <pre><tt> o---o---o---o---o master
499 \
500 o---o---o---o---o next
501 \
502 o---o---o topic</tt></pre>
503 </div></div>
504 <div class="paragraph"><p>We want to make <em>topic</em> forked from branch <em>master</em>; for example,
509 <pre><tt> o---o---o---o---o master
510 | \
511 | o'--o'--o' topic
512 \
513 o---o---o---o---o next</tt></pre>
514 </div></div>
519 </div></div>
521 branch. If we have the following situation:</p></div>
524 <pre><tt> H---I---J topicB
525 /
526 E---F---G topicA
527 /
528 A---B---C---D master</tt></pre>
529 </div></div>
534 </div></div>
538 <pre><tt> H'--I'--J' topicB
539 /
540 | E---F---G topicA
541 |/
542 A---B---C---D master</tt></pre>
543 </div></div>
546 the following situation:</p></div>
550 </div></div>
555 </div></div>
560 </div></div>
563 parameter can be any valid commit-ish.</p></div>
564 <div class="paragraph"><p>In case of conflict, <em>git rebase</em> will stop at the first problematic commit
566 the markers (<<<<<<) and make edits to resolve the conflict. For each
567 file you edit, you need to tell git that the conflict has been resolved,
568 typically this would be done with</p></div>
572 </div></div>
574 desired resolution, you can continue the rebasing process with</p></div>
578 </div></div>
583 </div></div>
584 </div>
589 rebase.stat
590 </dt>
591 <dd>
592 <p>
593 Whether to show a diffstat of what changed upstream since the last
594 rebase. False by default.
595 </p>
596 </dd>
598 rebase.autosquash
599 </dt>
600 <dd>
601 <p>
603 </p>
604 </dd>
605 </dl></div>
606 </div>
612 </dt>
613 <dd>
614 <p>
615 Starting point at which to create the new commits. If the
616 --onto option is not specified, the starting point is
618 existing branch name.
619 </p>
621 merge base of A and B if there is exactly one merge base. You can
622 leave out at most one of A and B, in which case it defaults to HEAD.</p></div>
623 </dd>
626 </dt>
627 <dd>
628 <p>
629 Upstream branch to compare against. May be any valid commit,
630 not just an existing branch name.
631 </p>
632 </dd>
635 </dt>
636 <dd>
637 <p>
638 Working branch; defaults to HEAD.
639 </p>
640 </dd>
642 --continue
643 </dt>
644 <dd>
645 <p>
646 Restart the rebasing process after having resolved a merge conflict.
647 </p>
648 </dd>
650 --abort
651 </dt>
652 <dd>
653 <p>
654 Restore the original branch and abort the rebase operation.
655 </p>
656 </dd>
658 --skip
659 </dt>
660 <dd>
661 <p>
662 Restart the rebasing process by skipping the current patch.
663 </p>
664 </dd>
666 -m
667 </dt>
669 --merge
670 </dt>
671 <dd>
672 <p>
673 Use merging strategies to rebase. When the recursive (default) merge
674 strategy is used, this allows rebase to be aware of renames on the
675 upstream side.
676 </p>
677 <div class="paragraph"><p>Note that a rebase merge works by replaying each commit from the working
681 other words, the sides are swapped.</p></div>
682 </dd>
685 </dt>
688 </dt>
689 <dd>
690 <p>
691 Use the given merge strategy.
693 instead. This implies --merge.
694 </p>
695 <div class="paragraph"><p>Because <em>git rebase</em> replays each commit from the working branch
698 which makes little sense.</p></div>
699 </dd>
702 </dt>
705 </dt>
706 <dd>
707 <p>
712 </p>
713 </dd>
715 -q
716 </dt>
718 --quiet
719 </dt>
720 <dd>
721 <p>
722 Be quiet. Implies --no-stat.
723 </p>
724 </dd>
726 -v
727 </dt>
729 --verbose
730 </dt>
731 <dd>
732 <p>
733 Be verbose. Implies --stat.
734 </p>
735 </dd>
737 --stat
738 </dt>
739 <dd>
740 <p>
741 Show a diffstat of what changed upstream since the last rebase. The
742 diffstat is also controlled by the configuration option rebase.stat.
743 </p>
744 </dd>
746 -n
747 </dt>
749 --no-stat
750 </dt>
751 <dd>
752 <p>
753 Do not show a diffstat as part of the rebase process.
754 </p>
755 </dd>
757 --no-verify
758 </dt>
759 <dd>
760 <p>
762 </p>
763 </dd>
765 --verify
766 </dt>
767 <dd>
768 <p>
769 Allows the pre-rebase hook to run, which is the default. This option can
771 </p>
772 </dd>
775 </dt>
776 <dd>
777 <p>
779 and after each change. When fewer lines of surrounding
780 context exist they all must match. By default no context is
781 ever ignored.
782 </p>
783 </dd>
785 -f
786 </dt>
788 --force-rebase
789 </dt>
790 <dd>
791 <p>
792 Force the rebase even if the current branch is a descendant
793 of the commit you are rebasing onto. Normally non-interactive rebase will
794 exit with the message "Current branch is up to date" in such a
795 situation.
796 Incompatible with the --interactive option.
797 </p>
798 <div class="paragraph"><p>You may find this (or --no-ff with an interactive rebase) helpful after
799 reverting a topic branch merge, as this option recreates the topic branch with
800 fresh commits so it can be remerged successfully without needing to "revert
801 the reversion" (see the
802 <a href="howto/revert-a-faulty-merge.txt">revert-a-faulty-merge How-To</a> for details).</p></div>
803 </dd>
805 --ignore-whitespace
806 </dt>
809 </dt>
810 <dd>
811 <p>
814 Incompatible with the --interactive option.
815 </p>
816 </dd>
818 --committer-date-is-author-date
819 </dt>
821 --ignore-date
822 </dt>
823 <dd>
824 <p>
827 Incompatible with the --interactive option.
828 </p>
829 </dd>
831 -i
832 </dt>
834 --interactive
835 </dt>
836 <dd>
837 <p>
838 Make a list of the commits which are about to be rebased. Let the
839 user edit that list before rebasing. This mode can also be used to
840 split commits (see SPLITTING COMMITS below).
841 </p>
842 </dd>
844 -p
845 </dt>
847 --preserve-merges
848 </dt>
849 <dd>
850 <p>
851 Instead of ignoring merges, try to recreate them.
852 </p>
853 <div class="paragraph"><p>This uses the <tt>--interactive</tt> machinery internally, but combining it
855 idea unless you know what you are doing (see BUGS below).</p></div>
856 </dd>
858 --root
859 </dt>
860 <dd>
861 <p>
864 the root commit(s) on a branch. Must be used with --onto, and
868 instead.
869 </p>
870 </dd>
872 --autosquash
873 </dt>
875 --no-autosquash
876 </dt>
877 <dd>
878 <p>
879 When the commit log message begins with "squash! …" (or
880 "fixup! …"), and there is a commit whose title begins with
881 the same …, automatically modify the todo list of rebase -i
882 so that the commit marked for squashing comes right after the
883 commit to be modified, and change the action of the moved
885 </p>
886 <div class="paragraph"><p>This option is only valid when the <em>--interactive</em> option is used.</p></div>
889 used to override and disable this setting.</p></div>
890 </dd>
892 --no-ff
893 </dt>
894 <dd>
895 <p>
896 With --interactive, cherry-pick all rebased commits instead of
897 fast-forwarding over the unchanged ones. This ensures that the
898 entire history of the rebased branch is composed of new commits.
899 </p>
900 <div class="paragraph"><p>Without --interactive, this is a synonym for --force-rebase.</p></div>
901 <div class="paragraph"><p>You may find this helpful after reverting a topic branch merge, as this option
902 recreates the topic branch with fresh commits so it can be remerged
903 successfully without needing to "revert the reversion" (see the
904 <a href="howto/revert-a-faulty-merge.txt">revert-a-faulty-merge How-To</a> for details).</p></div>
905 </dd>
906 </dl></div>
907 </div>
910 <div class="paragraph"><p>The merge mechanism (<em>git-merge</em> and <em>git-pull</em> commands) allows the
916 resolve
917 </dt>
918 <dd>
919 <p>
920 This can only resolve two heads (i.e. the current branch
921 and another branch you pulled from) using a 3-way merge
922 algorithm. It tries to carefully detect criss-cross
923 merge ambiguities and is considered generally safe and
924 fast.
925 </p>
926 </dd>
928 recursive
929 </dt>
930 <dd>
931 <p>
932 This can only resolve two heads using a 3-way merge
933 algorithm. When there is more than one common
934 ancestor that can be used for 3-way merge, it creates a
935 merged tree of the common ancestors and uses that as
936 the reference tree for the 3-way merge. This has been
937 reported to result in fewer merge conflicts without
938 causing mis-merges by tests done on actual merge commits
939 taken from Linux 2.6 kernel development history.
940 Additionally this can detect and handle merges involving
941 renames. This is the default merge strategy when
942 pulling or merging one branch.
943 </p>
944 <div class="paragraph"><p>The <em>recursive</em> strategy can take the following options:</p></div>
947 ours
948 </dt>
949 <dd>
950 <p>
951 This option forces conflicting hunks to be auto-resolved cleanly by
953 conflict with our side are reflected to the merge result.
954 </p>
955 <div class="paragraph"><p>This should not be confused with the <em>ours</em> merge strategy, which does not
956 even look at what the other tree contains at all. It discards everything
958 </dd>
960 theirs
961 </dt>
962 <dd>
963 <p>
965 </p>
966 </dd>
968 patience
969 </dt>
970 <dd>
971 <p>
973 to avoid mismerges that sometimes occur due to unimportant
974 matching lines (e.g., braces from distinct functions). Use
975 this when the branches to be merged have diverged wildly.
977 </p>
978 </dd>
980 ignore-space-change
981 </dt>
983 ignore-all-space
984 </dt>
986 ignore-space-at-eol
987 </dt>
988 <dd>
989 <p>
990 Treats lines with the indicated type of whitespace change as
991 unchanged for the sake of a three-way merge. Whitespace
992 changes mixed with other changes to a line are not ignored.
995 </p>
997 <li>
998 <p>
1001 </p>
1002 </li>
1003 <li>
1004 <p>
1007 </p>
1008 </li>
1009 <li>
1010 <p>
1011 Otherwise, the merge proceeds in the usual way.
1012 </p>
1013 </li>
1014 </ul></div>
1015 </dd>
1017 renormalize
1018 </dt>
1019 <dd>
1020 <p>
1021 This runs a virtual check-out and check-in of all three stages
1022 of a file when resolving a three-way merge. This option is
1023 meant to be used when merging branches with different clean
1024 filters or end-of-line normalization rules. See "Merging
1025 branches with differing checkin/checkout attributes" in
1027 </p>
1028 </dd>
1030 no-renormalize
1031 </dt>
1032 <dd>
1033 <p>
1036 </p>
1037 </dd>
1040 </dt>
1041 <dd>
1042 <p>
1043 Controls the similarity threshold used for rename detection.
1045 </p>
1046 </dd>
1049 </dt>
1050 <dd>
1051 <p>
1053 the strategy makes a guess on how two trees must be shifted to
1054 match with each other when merging. Instead, the specified path
1055 is prefixed (or stripped from the beginning) to make the shape of
1056 two trees to match.
1057 </p>
1058 </dd>
1059 </dl></div>
1060 </dd>
1062 octopus
1063 </dt>
1064 <dd>
1065 <p>
1066 This resolves cases with more than two heads, but refuses to do
1067 a complex merge that needs manual resolution. It is
1068 primarily meant to be used for bundling topic branch
1069 heads together. This is the default merge strategy when
1070 pulling or merging more than one branch.
1071 </p>
1072 </dd>
1074 ours
1075 </dt>
1076 <dd>
1077 <p>
1078 This resolves any number of heads, but the resulting tree of the
1079 merge is always that of the current branch head, effectively
1080 ignoring all changes from all other branches. It is meant to
1081 be used to supersede old development history of side
1082 branches. Note that this is different from the -Xours option to
1084 </p>
1085 </dd>
1087 subtree
1088 </dt>
1089 <dd>
1090 <p>
1091 This is a modified recursive strategy. When merging trees A and
1092 B, if B corresponds to a subtree of A, B is first adjusted to
1093 match the tree structure of A, instead of reading the trees at
1094 the same level. This adjustment is also done to the common
1095 ancestor tree.
1096 </p>
1097 </dd>
1098 </dl></div>
1099 </div>
1102 <div class="paragraph"><p>You should understand the implications of using <em>git rebase</em> on a
1103 repository that you share. See also RECOVERING FROM UPSTREAM REBASE
1104 below.</p></div>
1105 <div class="paragraph"><p>When the git-rebase command is run, it will first execute a "pre-rebase"
1106 hook if one exists. You can use this hook to do sanity checks and
1107 reject the rebase if it isn’t appropriate. Please see the template
1108 pre-rebase hook script for an example.</p></div>
1109 <div class="paragraph"><p>Upon completion, <branch> will be the current branch.</p></div>
1110 </div>
1113 <div class="paragraph"><p>Rebasing interactively means that you have a chance to edit the commits
1114 which are rebased. You can reorder the commits, and you can
1115 remove them (weeding out bad or otherwise unwanted patches).</p></div>
1118 <li>
1119 <p>
1120 have a wonderful idea
1121 </p>
1122 </li>
1123 <li>
1124 <p>
1125 hack on the code
1126 </p>
1127 </li>
1128 <li>
1129 <p>
1130 prepare a series for submission
1131 </p>
1132 </li>
1133 <li>
1134 <p>
1135 submit
1136 </p>
1137 </li>
1138 </ol></div>
1141 <li>
1142 <p>
1143 regular use
1144 </p>
1146 <li>
1147 <p>
1148 finish something worthy of a commit
1149 </p>
1150 </li>
1151 <li>
1152 <p>
1153 commit
1154 </p>
1155 </li>
1156 </ol></div>
1157 </li>
1158 <li>
1159 <p>
1160 independent fixup
1161 </p>
1163 <li>
1164 <p>
1165 realize that something does not work
1166 </p>
1167 </li>
1168 <li>
1169 <p>
1170 fix that
1171 </p>
1172 </li>
1173 <li>
1174 <p>
1175 commit it
1176 </p>
1177 </li>
1178 </ol></div>
1179 </li>
1180 </ol></div>
1182 perfect commit it fixes, because that commit is buried deeply in a
1183 patch series. That is exactly what interactive rebase is for: use it
1185 commits, and squashing multiple commits into one.</p></div>
1190 </div></div>
1191 <div class="paragraph"><p>An editor will be fired up with all the commits in your current branch
1192 (ignoring merge commits), which come after the given commit. You can
1193 reorder the commits in this list to your heart’s content, and you can
1194 remove them. The list looks more or less like this:</p></div>
1197 <pre><tt>pick deadbee The oneline of this commit
1198 pick fa1afe1 The oneline of the next commit
1199 ...</tt></pre>
1200 </div></div>
1201 <div class="paragraph"><p>The oneline descriptions are purely for your pleasure; <em>git rebase</em> will
1203 example), so do not delete or edit the names.</p></div>
1204 <div class="paragraph"><p>By replacing the command "pick" with the command "edit", you can tell
1206 the files and/or the commit message, amend the commit, and continue
1207 rebasing.</p></div>
1208 <div class="paragraph"><p>If you just want to edit the commit message for a commit, replace the
1210 <div class="paragraph"><p>If you want to fold two or more commits into one, replace the command
1212 If the commits had different authors, the folded commit will be
1213 attributed to the author of the first commit. The suggested commit
1214 message for the folded commit is the concatenation of the commit
1215 messages of the first commit and of those with the "squash" command,
1217 <div class="paragraph"><p><em>git rebase</em> will stop when "pick" has been replaced with "edit" or
1218 when a command fails due to merge errors. When you are done editing
1220 <div class="paragraph"><p>For example, if you want to reorder the last 5 commits, such that what
1221 was HEAD~4 becomes the new HEAD. To achieve that, you would call
1226 </div></div>
1228 <div class="paragraph"><p>You might want to preserve merges, if you have a history like this:</p></div>
1231 <pre><tt> X
1232 \
1233 A---M---B
1234 /
1235 ---o---O---P---Q</tt></pre>
1236 </div></div>
1237 <div class="paragraph"><p>Suppose you want to rebase the side branch starting at "A" to "Q". Make
1242 </div></div>
1244 steps. You may want to check that your history editing did not break
1245 anything by running a test, or at least recompiling at intermediate
1247 do so by creating a todo list like this one:</p></div>
1250 <pre><tt>pick deadbee Implement feature XXX
1251 fixup f1a5c00 Fix to feature XXX
1252 exec make
1253 pick c0ffeee The oneline of the next commit
1254 edit deadbab The oneline of the commit after
1255 exec cd subdir; make test
1256 ...</tt></pre>
1257 </div></div>
1258 <div class="paragraph"><p>The interactive rebase will stop when a command fails (i.e. exits with
1259 non-0 status) to give you an opportunity to fix the problem. You can
1261 <div class="paragraph"><p>The "exec" command launches the command in a shell (the one specified
1264 the root of the working tree.</p></div>
1265 </div>
1268 <div class="paragraph"><p>In interactive mode, you can mark commits with the action "edit". However,
1270 edit to be exactly one commit. Indeed, you can undo the commit, or you can
1271 add other commits. This can be used to split a commit into two:</p></div>
1273 <li>
1274 <p>
1277 will do, as long as it contains that commit.
1278 </p>
1279 </li>
1280 <li>
1281 <p>
1282 Mark the commit you want to split with the action "edit".
1283 </p>
1284 </li>
1285 <li>
1286 <p>
1288 effect is that the HEAD is rewound by one, and the index follows suit.
1289 However, the working tree stays the same.
1290 </p>
1291 </li>
1292 <li>
1293 <p>
1294 Now add the changes to the index that you want to have in the first
1297 </p>
1298 </li>
1299 <li>
1300 <p>
1301 Commit the now-current index with whatever commit message is appropriate
1302 now.
1303 </p>
1304 </li>
1305 <li>
1306 <p>
1307 Repeat the last two steps until your working tree is clean.
1308 </p>
1309 </li>
1310 <li>
1311 <p>
1313 </p>
1314 </li>
1315 </ul></div>
1317 consistent (they compile, pass the testsuite, etc.) you should use
1319 after each commit, test, and amend the commit if fixes are necessary.</p></div>
1320 </div>
1324 based work on is a bad idea: anyone downstream of it is forced to
1325 manually fix their history. This section explains how to do the fix
1326 from the downstream’s point of view. The real fix, however, would be
1327 to avoid rebasing the upstream in the first place.</p></div>
1328 <div class="paragraph"><p>To illustrate, suppose you are in a situation where someone develops a
1331 following:</p></div>
1334 <pre><tt> o---o---o---o---o---o---o---o---o master
1335 \
1336 o---o---o---o---o subsystem
1337 \
1338 *---*---* topic</tt></pre>
1339 </div></div>
1340 <div class="paragraph"><p>If <em>subsystem</em> is rebased against <em>master</em>, the following happens:</p></div>
1343 <pre><tt> o---o---o---o---o---o---o---o master
1344 \ \
1345 o---o---o---o---o o'--o'--o'--o'--o' subsystem
1346 \
1347 *---*---* topic</tt></pre>
1348 </div></div>
1349 <div class="paragraph"><p>If you now continue development as usual, and eventually merge <em>topic</em>
1350 to <em>subsystem</em>, the commits from <em>subsystem</em> will remain duplicated forever:</p></div>
1353 <pre><tt> o---o---o---o---o---o---o---o master
1354 \ \
1355 o---o---o---o---o o'--o'--o'--o'--o'--M subsystem
1356 \ /
1357 *---*---*-..........-*--* topic</tt></pre>
1358 </div></div>
1360 history, making it harder to follow. To clean things up, you need to
1364 <div class="paragraph"><p>There are two kinds of fixes, discussed in the following subsections:</p></div>
1367 Easy case: The changes are literally the same.
1368 </dt>
1369 <dd>
1370 <p>
1372 had no conflicts.
1373 </p>
1374 </dd>
1376 Hard case: The changes are not the same.
1377 </dt>
1378 <dd>
1379 <p>
1384 </p>
1385 </dd>
1386 </dl></div>
1391 <div class="paragraph"><p>In that case, the fix is easy because <em>git rebase</em> knows to skip
1392 changes that are already present in the new upstream. So if you say
1397 </div></div>
1401 <pre><tt> o---o---o---o---o---o---o---o master
1402 \
1403 o'--o'--o'--o'--o' subsystem
1404 \
1405 *---*---* topic</tt></pre>
1406 </div></div>
1408 <div class="paragraph"><p>Things get more complicated if the <em>subsystem</em> changes do not exactly
1409 correspond to the ones before the rebase.</p></div>
1411 <table><tr>
1414 </td>
1416 even in the hard case, it may have unintended consequences. For
1417 example, a commit that was removed via <tt>git rebase
1419 </tr></table>
1420 </div>
1421 <div class="paragraph"><p>The idea is to manually tell <em>git rebase</em> "where the old <em>subsystem</em>
1422 ended and your <em>topic</em> began", that is, what the old merge-base
1423 between them was. You will have to find a way to name the last commit
1426 <li>
1427 <p>
1431 </p>
1432 </li>
1433 <li>
1434 <p>
1437 </p>
1438 </li>
1439 </ul></div>
1440 <div class="paragraph"><p>You can then transplant the old <tt>subsystem..topic</tt> to the new tip by
1445 </div></div>
1449 </div>
1452 <div class="paragraph"><p>The todo list presented by <tt>--preserve-merges --interactive</tt> does not
1453 represent the topology of the revision graph. Editing commits and
1454 rewording their commit messages should work fine, but attempts to
1455 reorder commits tend to produce counterintuitive results.</p></div>
1460 </div></div>
1465 </div></div>
1466 <div class="paragraph"><p>by moving the "pick 4" line will result in the following history:</p></div>
1470 /
1472 </div></div>
1473 </div>
1476 <div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>> and
1477 Johannes E. Schindelin <<a href="mailto:johannes.schindelin@gmx.de">johannes.schindelin@gmx.de</a>></p></div>
1478 </div>
1481 <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>
1482 </div>
1486 </div>
1490 </div>
1491 </div>
1492 </body>
1493 </html>