| blob | 9ea1f9645e775ea515b9f41b1a3e5898d5de5062 |
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 }
129 }
133 }
135 /* Block element titles. */
143 }
146 }
150 }
153 }
156 }
162 }
168 }
176 }
181 }
185 }
189 }
190 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
193 }
202 }
206 }
211 }
217 dl {
220 }
221 dt {
226 }
229 }
233 }
236 }
239 }
242 }
245 }
248 }
255 }
259 }
263 }
264 tfoot {
266 }
269 }
272 }
273 /* Because the table frame attribute is overriden by CSS in most browsers. */
276 }
280 }
284 }
290 }
293 }
296 }
302 }
305 }
309 }
313 }
317 }
321 }
326 }
330 }
340 }
345 }
347 div#toc {
349 }
351 div#toctitle {
358 }
363 }
367 }
371 }
375 }
376 /* Overrides for manpage documents */
377 h1 {
382 }
383 h2 {
385 }
388 }
392 }
394 /* Workarounds for IE6's broken and incomplete CSS2. */
400 }
407 }
413 }
418 }
422 }
426 }
431 }
433 /* IE6 sets dynamically generated links as visited. */
435 </style>
437 /*<![CDATA[*/
441 /////////////////////////////////////////////////////////////////////
442 // Table Of Contents generator
443 /////////////////////////////////////////////////////////////////////
445 /* Author: Mihai Bazon, September 2002
446 * http://students.infoiasi.ro/~mishoo
447 *
448 * Table Of Content generator
449 * Version: 0.4
450 *
451 * Feel free to use this script under the terms of the GNU General Public
452 * License, as long as you do not remove or alter this notice.
453 */
455 /* modified by Troy D. Hanson, September 2006. License: GPL */
456 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
458 // toclevels = 1..4.
468 }
470 }
476 }
481 // Function that scans the DOM tree for header elements (the DOM2
482 // nodeIterator API would be a better technique but not supported by all
483 // browsers).
490 }
492 }
493 }
494 }
497 }
512 }
515 },
518 /////////////////////////////////////////////////////////////////////
519 // Footnotes generator
520 /////////////////////////////////////////////////////////////////////
522 /* Based on footnote generation code from:
523 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
524 */
534 n++;
535 // Use [\s\S] in place of . so multi-line matches work.
536 // Because JavaScript has no s (dotall) regex flag.
547 }
548 }
552 // Process footnoterefs.
561 }
562 }
563 }
564 }
566 }
567 /*]]>*/
568 </script>
569 </head>
570 <body>
572 <h1>
573 git-rebase(1) Manual Page
574 </h1>
577 <p>git-rebase -
578 Forward-port local commits to the updated upstream head
579 </p>
580 </div>
581 </div>
586 <div class="verseblock-content"><em>git rebase</em> [-i | --interactive] [options] [--onto <newbase>]
592 </div></div>
593 </div>
596 <div class="paragraph"><p>If <branch> is specified, <em>git rebase</em> will perform an automatic
598 it remains on the current branch.</p></div>
602 branch or if the current branch does not have a configured upstream,
603 the rebase will abort.</p></div>
608 <div class="paragraph"><p>The current branch is reset to <upstream>, or <newbase> if the
609 --onto option was supplied. This has the exact same effect as
611 to point at the tip of the branch before the reset.</p></div>
613 then reapplied to the current branch, one by one, in order. Note that
614 any commits in HEAD which introduce the same textual changes as a commit
616 with a different commit message or timestamp will be skipped).</p></div>
617 <div class="paragraph"><p>It is possible that a merge failure will prevent this process from being
618 completely automatic. You will have to resolve any such merge failure
623 <div class="paragraph"><p>Assume the following history exists and the current branch is "topic":</p></div>
626 <pre><tt> A---B---C topic
627 /
628 D---E---F---G master</tt></pre>
629 </div></div>
630 <div class="paragraph"><p>From this point, the result of either of the following commands:</p></div>
633 <pre><tt>git rebase master
634 git rebase master topic</tt></pre>
635 </div></div>
639 <pre><tt> A'--B'--C' topic
640 /
641 D---E---F---G master</tt></pre>
642 </div></div>
643 <div class="paragraph"><p><strong>NOTE:</strong> The latter form is just a short-hand of <tt>git checkout topic</tt>
645 remain the checked-out branch.</p></div>
647 because you mailed a patch which was applied upstream), then that commit
648 will be skipped. For example, running ‘git rebase master` on the
649 following history (in which A’ and A introduce the same set of changes,
650 but have different committer information):</p></div>
653 <pre><tt> A---B---C topic
654 /
655 D---E---A'---F master</tt></pre>
656 </div></div>
660 <pre><tt> B'---C' topic
661 /
662 D---E---A'---F master</tt></pre>
663 </div></div>
665 branch to another, to pretend that you forked the topic branch
667 <div class="paragraph"><p>First let’s assume your <em>topic</em> is based on branch <em>next</em>.
672 <pre><tt> o---o---o---o---o master
673 \
674 o---o---o---o---o next
675 \
676 o---o---o topic</tt></pre>
677 </div></div>
678 <div class="paragraph"><p>We want to make <em>topic</em> forked from branch <em>master</em>; for example,
683 <pre><tt> o---o---o---o---o master
684 | \
685 | o'--o'--o' topic
686 \
687 o---o---o---o---o next</tt></pre>
688 </div></div>
693 </div></div>
695 branch. If we have the following situation:</p></div>
698 <pre><tt> H---I---J topicB
699 /
700 E---F---G topicA
701 /
702 A---B---C---D master</tt></pre>
703 </div></div>
708 </div></div>
712 <pre><tt> H'--I'--J' topicB
713 /
714 | E---F---G topicA
715 |/
716 A---B---C---D master</tt></pre>
717 </div></div>
720 the following situation:</p></div>
724 </div></div>
729 </div></div>
734 </div></div>
737 parameter can be any valid commit-ish.</p></div>
738 <div class="paragraph"><p>In case of conflict, <em>git rebase</em> will stop at the first problematic commit
740 the markers (<<<<<<) and make edits to resolve the conflict. For each
741 file you edit, you need to tell git that the conflict has been resolved,
742 typically this would be done with</p></div>
746 </div></div>
748 desired resolution, you can continue the rebasing process with</p></div>
752 </div></div>
757 </div></div>
758 </div>
763 rebase.stat
764 </dt>
765 <dd>
766 <p>
767 Whether to show a diffstat of what changed upstream since the last
768 rebase. False by default.
769 </p>
770 </dd>
772 rebase.autosquash
773 </dt>
774 <dd>
775 <p>
777 </p>
778 </dd>
779 </dl></div>
780 </div>
786 </dt>
787 <dd>
788 <p>
789 Starting point at which to create the new commits. If the
790 --onto option is not specified, the starting point is
792 existing branch name.
793 </p>
795 merge base of A and B if there is exactly one merge base. You can
796 leave out at most one of A and B, in which case it defaults to HEAD.</p></div>
797 </dd>
800 </dt>
801 <dd>
802 <p>
803 Upstream branch to compare against. May be any valid commit,
804 not just an existing branch name. Defaults to the configured
805 upstream for the current branch.
806 </p>
807 </dd>
810 </dt>
811 <dd>
812 <p>
813 Working branch; defaults to HEAD.
814 </p>
815 </dd>
817 --continue
818 </dt>
819 <dd>
820 <p>
821 Restart the rebasing process after having resolved a merge conflict.
822 </p>
823 </dd>
825 --abort
826 </dt>
827 <dd>
828 <p>
829 Abort the rebase operation and reset HEAD to the original
832 will be reset to where it was when the rebase operation was
833 started.
834 </p>
835 </dd>
837 --skip
838 </dt>
839 <dd>
840 <p>
841 Restart the rebasing process by skipping the current patch.
842 </p>
843 </dd>
845 -m
846 </dt>
848 --merge
849 </dt>
850 <dd>
851 <p>
852 Use merging strategies to rebase. When the recursive (default) merge
853 strategy is used, this allows rebase to be aware of renames on the
854 upstream side.
855 </p>
856 <div class="paragraph"><p>Note that a rebase merge works by replaying each commit from the working
860 other words, the sides are swapped.</p></div>
861 </dd>
864 </dt>
867 </dt>
868 <dd>
869 <p>
870 Use the given merge strategy.
872 instead. This implies --merge.
873 </p>
874 <div class="paragraph"><p>Because <em>git rebase</em> replays each commit from the working branch
877 which makes little sense.</p></div>
878 </dd>
881 </dt>
884 </dt>
885 <dd>
886 <p>
891 </p>
892 </dd>
894 -q
895 </dt>
897 --quiet
898 </dt>
899 <dd>
900 <p>
901 Be quiet. Implies --no-stat.
902 </p>
903 </dd>
905 -v
906 </dt>
908 --verbose
909 </dt>
910 <dd>
911 <p>
912 Be verbose. Implies --stat.
913 </p>
914 </dd>
916 --stat
917 </dt>
918 <dd>
919 <p>
920 Show a diffstat of what changed upstream since the last rebase. The
921 diffstat is also controlled by the configuration option rebase.stat.
922 </p>
923 </dd>
925 -n
926 </dt>
928 --no-stat
929 </dt>
930 <dd>
931 <p>
932 Do not show a diffstat as part of the rebase process.
933 </p>
934 </dd>
936 --no-verify
937 </dt>
938 <dd>
939 <p>
941 </p>
942 </dd>
944 --verify
945 </dt>
946 <dd>
947 <p>
948 Allows the pre-rebase hook to run, which is the default. This option can
950 </p>
951 </dd>
954 </dt>
955 <dd>
956 <p>
958 and after each change. When fewer lines of surrounding
959 context exist they all must match. By default no context is
960 ever ignored.
961 </p>
962 </dd>
964 -f
965 </dt>
967 --force-rebase
968 </dt>
969 <dd>
970 <p>
971 Force the rebase even if the current branch is a descendant
972 of the commit you are rebasing onto. Normally non-interactive rebase will
973 exit with the message "Current branch is up to date" in such a
974 situation.
975 Incompatible with the --interactive option.
976 </p>
977 <div class="paragraph"><p>You may find this (or --no-ff with an interactive rebase) helpful after
978 reverting a topic branch merge, as this option recreates the topic branch with
979 fresh commits so it can be remerged successfully without needing to "revert
980 the reversion" (see the
981 <a href="howto/revert-a-faulty-merge.txt">revert-a-faulty-merge How-To</a> for details).</p></div>
982 </dd>
984 --ignore-whitespace
985 </dt>
988 </dt>
989 <dd>
990 <p>
993 Incompatible with the --interactive option.
994 </p>
995 </dd>
997 --committer-date-is-author-date
998 </dt>
1000 --ignore-date
1001 </dt>
1002 <dd>
1003 <p>
1006 Incompatible with the --interactive option.
1007 </p>
1008 </dd>
1010 -i
1011 </dt>
1013 --interactive
1014 </dt>
1015 <dd>
1016 <p>
1017 Make a list of the commits which are about to be rebased. Let the
1018 user edit that list before rebasing. This mode can also be used to
1019 split commits (see SPLITTING COMMITS below).
1020 </p>
1021 </dd>
1023 -p
1024 </dt>
1026 --preserve-merges
1027 </dt>
1028 <dd>
1029 <p>
1030 Instead of ignoring merges, try to recreate them.
1031 </p>
1032 <div class="paragraph"><p>This uses the <tt>--interactive</tt> machinery internally, but combining it
1034 idea unless you know what you are doing (see BUGS below).</p></div>
1035 </dd>
1037 --root
1038 </dt>
1039 <dd>
1040 <p>
1043 the root commit(s) on a branch. Must be used with --onto, and
1047 instead.
1048 </p>
1049 </dd>
1051 --autosquash
1052 </dt>
1054 --no-autosquash
1055 </dt>
1056 <dd>
1057 <p>
1058 When the commit log message begins with "squash! …" (or
1059 "fixup! …"), and there is a commit whose title begins with
1060 the same …, automatically modify the todo list of rebase -i
1061 so that the commit marked for squashing comes right after the
1062 commit to be modified, and change the action of the moved
1064 </p>
1065 <div class="paragraph"><p>This option is only valid when the <em>--interactive</em> option is used.</p></div>
1068 used to override and disable this setting.</p></div>
1069 </dd>
1071 --no-ff
1072 </dt>
1073 <dd>
1074 <p>
1075 With --interactive, cherry-pick all rebased commits instead of
1076 fast-forwarding over the unchanged ones. This ensures that the
1077 entire history of the rebased branch is composed of new commits.
1078 </p>
1079 <div class="paragraph"><p>Without --interactive, this is a synonym for --force-rebase.</p></div>
1080 <div class="paragraph"><p>You may find this helpful after reverting a topic branch merge, as this option
1081 recreates the topic branch with fresh commits so it can be remerged
1082 successfully without needing to "revert the reversion" (see the
1083 <a href="howto/revert-a-faulty-merge.txt">revert-a-faulty-merge How-To</a> for details).</p></div>
1084 </dd>
1085 </dl></div>
1086 </div>
1089 <div class="paragraph"><p>The merge mechanism (<em>git-merge</em> and <em>git-pull</em> commands) allows the
1095 resolve
1096 </dt>
1097 <dd>
1098 <p>
1099 This can only resolve two heads (i.e. the current branch
1100 and another branch you pulled from) using a 3-way merge
1101 algorithm. It tries to carefully detect criss-cross
1102 merge ambiguities and is considered generally safe and
1103 fast.
1104 </p>
1105 </dd>
1107 recursive
1108 </dt>
1109 <dd>
1110 <p>
1111 This can only resolve two heads using a 3-way merge
1112 algorithm. When there is more than one common
1113 ancestor that can be used for 3-way merge, it creates a
1114 merged tree of the common ancestors and uses that as
1115 the reference tree for the 3-way merge. This has been
1116 reported to result in fewer merge conflicts without
1117 causing mis-merges by tests done on actual merge commits
1118 taken from Linux 2.6 kernel development history.
1119 Additionally this can detect and handle merges involving
1120 renames. This is the default merge strategy when
1121 pulling or merging one branch.
1122 </p>
1123 <div class="paragraph"><p>The <em>recursive</em> strategy can take the following options:</p></div>
1126 ours
1127 </dt>
1128 <dd>
1129 <p>
1130 This option forces conflicting hunks to be auto-resolved cleanly by
1132 conflict with our side are reflected to the merge result.
1133 </p>
1134 <div class="paragraph"><p>This should not be confused with the <em>ours</em> merge strategy, which does not
1135 even look at what the other tree contains at all. It discards everything
1137 </dd>
1139 theirs
1140 </dt>
1141 <dd>
1142 <p>
1144 </p>
1145 </dd>
1147 patience
1148 </dt>
1149 <dd>
1150 <p>
1152 to avoid mismerges that sometimes occur due to unimportant
1153 matching lines (e.g., braces from distinct functions). Use
1154 this when the branches to be merged have diverged wildly.
1156 </p>
1157 </dd>
1159 ignore-space-change
1160 </dt>
1162 ignore-all-space
1163 </dt>
1165 ignore-space-at-eol
1166 </dt>
1167 <dd>
1168 <p>
1169 Treats lines with the indicated type of whitespace change as
1170 unchanged for the sake of a three-way merge. Whitespace
1171 changes mixed with other changes to a line are not ignored.
1174 </p>
1176 <li>
1177 <p>
1180 </p>
1181 </li>
1182 <li>
1183 <p>
1186 </p>
1187 </li>
1188 <li>
1189 <p>
1190 Otherwise, the merge proceeds in the usual way.
1191 </p>
1192 </li>
1193 </ul></div>
1194 </dd>
1196 renormalize
1197 </dt>
1198 <dd>
1199 <p>
1200 This runs a virtual check-out and check-in of all three stages
1201 of a file when resolving a three-way merge. This option is
1202 meant to be used when merging branches with different clean
1203 filters or end-of-line normalization rules. See "Merging
1204 branches with differing checkin/checkout attributes" in
1206 </p>
1207 </dd>
1209 no-renormalize
1210 </dt>
1211 <dd>
1212 <p>
1215 </p>
1216 </dd>
1219 </dt>
1220 <dd>
1221 <p>
1222 Controls the similarity threshold used for rename detection.
1224 </p>
1225 </dd>
1228 </dt>
1229 <dd>
1230 <p>
1232 the strategy makes a guess on how two trees must be shifted to
1233 match with each other when merging. Instead, the specified path
1234 is prefixed (or stripped from the beginning) to make the shape of
1235 two trees to match.
1236 </p>
1237 </dd>
1238 </dl></div>
1239 </dd>
1241 octopus
1242 </dt>
1243 <dd>
1244 <p>
1245 This resolves cases with more than two heads, but refuses to do
1246 a complex merge that needs manual resolution. It is
1247 primarily meant to be used for bundling topic branch
1248 heads together. This is the default merge strategy when
1249 pulling or merging more than one branch.
1250 </p>
1251 </dd>
1253 ours
1254 </dt>
1255 <dd>
1256 <p>
1257 This resolves any number of heads, but the resulting tree of the
1258 merge is always that of the current branch head, effectively
1259 ignoring all changes from all other branches. It is meant to
1260 be used to supersede old development history of side
1261 branches. Note that this is different from the -Xours option to
1263 </p>
1264 </dd>
1266 subtree
1267 </dt>
1268 <dd>
1269 <p>
1270 This is a modified recursive strategy. When merging trees A and
1271 B, if B corresponds to a subtree of A, B is first adjusted to
1272 match the tree structure of A, instead of reading the trees at
1273 the same level. This adjustment is also done to the common
1274 ancestor tree.
1275 </p>
1276 </dd>
1277 </dl></div>
1278 </div>
1281 <div class="paragraph"><p>You should understand the implications of using <em>git rebase</em> on a
1282 repository that you share. See also RECOVERING FROM UPSTREAM REBASE
1283 below.</p></div>
1284 <div class="paragraph"><p>When the git-rebase command is run, it will first execute a "pre-rebase"
1285 hook if one exists. You can use this hook to do sanity checks and
1286 reject the rebase if it isn’t appropriate. Please see the template
1287 pre-rebase hook script for an example.</p></div>
1288 <div class="paragraph"><p>Upon completion, <branch> will be the current branch.</p></div>
1289 </div>
1292 <div class="paragraph"><p>Rebasing interactively means that you have a chance to edit the commits
1293 which are rebased. You can reorder the commits, and you can
1294 remove them (weeding out bad or otherwise unwanted patches).</p></div>
1297 <li>
1298 <p>
1299 have a wonderful idea
1300 </p>
1301 </li>
1302 <li>
1303 <p>
1304 hack on the code
1305 </p>
1306 </li>
1307 <li>
1308 <p>
1309 prepare a series for submission
1310 </p>
1311 </li>
1312 <li>
1313 <p>
1314 submit
1315 </p>
1316 </li>
1317 </ol></div>
1320 <li>
1321 <p>
1322 regular use
1323 </p>
1325 <li>
1326 <p>
1327 finish something worthy of a commit
1328 </p>
1329 </li>
1330 <li>
1331 <p>
1332 commit
1333 </p>
1334 </li>
1335 </ol></div>
1336 </li>
1337 <li>
1338 <p>
1339 independent fixup
1340 </p>
1342 <li>
1343 <p>
1344 realize that something does not work
1345 </p>
1346 </li>
1347 <li>
1348 <p>
1349 fix that
1350 </p>
1351 </li>
1352 <li>
1353 <p>
1354 commit it
1355 </p>
1356 </li>
1357 </ol></div>
1358 </li>
1359 </ol></div>
1361 perfect commit it fixes, because that commit is buried deeply in a
1362 patch series. That is exactly what interactive rebase is for: use it
1364 commits, and squashing multiple commits into one.</p></div>
1369 </div></div>
1370 <div class="paragraph"><p>An editor will be fired up with all the commits in your current branch
1371 (ignoring merge commits), which come after the given commit. You can
1372 reorder the commits in this list to your heart’s content, and you can
1373 remove them. The list looks more or less like this:</p></div>
1376 <pre><tt>pick deadbee The oneline of this commit
1377 pick fa1afe1 The oneline of the next commit
1378 ...</tt></pre>
1379 </div></div>
1380 <div class="paragraph"><p>The oneline descriptions are purely for your pleasure; <em>git rebase</em> will
1382 example), so do not delete or edit the names.</p></div>
1383 <div class="paragraph"><p>By replacing the command "pick" with the command "edit", you can tell
1385 the files and/or the commit message, amend the commit, and continue
1386 rebasing.</p></div>
1387 <div class="paragraph"><p>If you just want to edit the commit message for a commit, replace the
1389 <div class="paragraph"><p>If you want to fold two or more commits into one, replace the command
1391 If the commits had different authors, the folded commit will be
1392 attributed to the author of the first commit. The suggested commit
1393 message for the folded commit is the concatenation of the commit
1394 messages of the first commit and of those with the "squash" command,
1396 <div class="paragraph"><p><em>git rebase</em> will stop when "pick" has been replaced with "edit" or
1397 when a command fails due to merge errors. When you are done editing
1399 <div class="paragraph"><p>For example, if you want to reorder the last 5 commits, such that what
1400 was HEAD~4 becomes the new HEAD. To achieve that, you would call
1405 </div></div>
1407 <div class="paragraph"><p>You might want to preserve merges, if you have a history like this:</p></div>
1410 <pre><tt> X
1411 \
1412 A---M---B
1413 /
1414 ---o---O---P---Q</tt></pre>
1415 </div></div>
1416 <div class="paragraph"><p>Suppose you want to rebase the side branch starting at "A" to "Q". Make
1421 </div></div>
1423 steps. You may want to check that your history editing did not break
1424 anything by running a test, or at least recompiling at intermediate
1426 do so by creating a todo list like this one:</p></div>
1429 <pre><tt>pick deadbee Implement feature XXX
1430 fixup f1a5c00 Fix to feature XXX
1431 exec make
1432 pick c0ffeee The oneline of the next commit
1433 edit deadbab The oneline of the commit after
1434 exec cd subdir; make test
1435 ...</tt></pre>
1436 </div></div>
1437 <div class="paragraph"><p>The interactive rebase will stop when a command fails (i.e. exits with
1438 non-0 status) to give you an opportunity to fix the problem. You can
1440 <div class="paragraph"><p>The "exec" command launches the command in a shell (the one specified
1443 the root of the working tree.</p></div>
1444 </div>
1447 <div class="paragraph"><p>In interactive mode, you can mark commits with the action "edit". However,
1449 edit to be exactly one commit. Indeed, you can undo the commit, or you can
1450 add other commits. This can be used to split a commit into two:</p></div>
1452 <li>
1453 <p>
1456 will do, as long as it contains that commit.
1457 </p>
1458 </li>
1459 <li>
1460 <p>
1461 Mark the commit you want to split with the action "edit".
1462 </p>
1463 </li>
1464 <li>
1465 <p>
1467 effect is that the HEAD is rewound by one, and the index follows suit.
1468 However, the working tree stays the same.
1469 </p>
1470 </li>
1471 <li>
1472 <p>
1473 Now add the changes to the index that you want to have in the first
1476 </p>
1477 </li>
1478 <li>
1479 <p>
1480 Commit the now-current index with whatever commit message is appropriate
1481 now.
1482 </p>
1483 </li>
1484 <li>
1485 <p>
1486 Repeat the last two steps until your working tree is clean.
1487 </p>
1488 </li>
1489 <li>
1490 <p>
1492 </p>
1493 </li>
1494 </ul></div>
1496 consistent (they compile, pass the testsuite, etc.) you should use
1498 after each commit, test, and amend the commit if fixes are necessary.</p></div>
1499 </div>
1503 based work on is a bad idea: anyone downstream of it is forced to
1504 manually fix their history. This section explains how to do the fix
1505 from the downstream’s point of view. The real fix, however, would be
1506 to avoid rebasing the upstream in the first place.</p></div>
1507 <div class="paragraph"><p>To illustrate, suppose you are in a situation where someone develops a
1510 following:</p></div>
1513 <pre><tt> o---o---o---o---o---o---o---o---o master
1514 \
1515 o---o---o---o---o subsystem
1516 \
1517 *---*---* topic</tt></pre>
1518 </div></div>
1519 <div class="paragraph"><p>If <em>subsystem</em> is rebased against <em>master</em>, the following happens:</p></div>
1522 <pre><tt> o---o---o---o---o---o---o---o master
1523 \ \
1524 o---o---o---o---o o'--o'--o'--o'--o' subsystem
1525 \
1526 *---*---* topic</tt></pre>
1527 </div></div>
1528 <div class="paragraph"><p>If you now continue development as usual, and eventually merge <em>topic</em>
1529 to <em>subsystem</em>, the commits from <em>subsystem</em> will remain duplicated forever:</p></div>
1532 <pre><tt> o---o---o---o---o---o---o---o master
1533 \ \
1534 o---o---o---o---o o'--o'--o'--o'--o'--M subsystem
1535 \ /
1536 *---*---*-..........-*--* topic</tt></pre>
1537 </div></div>
1539 history, making it harder to follow. To clean things up, you need to
1543 <div class="paragraph"><p>There are two kinds of fixes, discussed in the following subsections:</p></div>
1546 Easy case: The changes are literally the same.
1547 </dt>
1548 <dd>
1549 <p>
1551 had no conflicts.
1552 </p>
1553 </dd>
1555 Hard case: The changes are not the same.
1556 </dt>
1557 <dd>
1558 <p>
1563 </p>
1564 </dd>
1565 </dl></div>
1570 <div class="paragraph"><p>In that case, the fix is easy because <em>git rebase</em> knows to skip
1571 changes that are already present in the new upstream. So if you say
1576 </div></div>
1580 <pre><tt> o---o---o---o---o---o---o---o master
1581 \
1582 o'--o'--o'--o'--o' subsystem
1583 \
1584 *---*---* topic</tt></pre>
1585 </div></div>
1587 <div class="paragraph"><p>Things get more complicated if the <em>subsystem</em> changes do not exactly
1588 correspond to the ones before the rebase.</p></div>
1590 <table><tr>
1593 </td>
1595 even in the hard case, it may have unintended consequences. For
1596 example, a commit that was removed via <tt>git rebase
1598 </tr></table>
1599 </div>
1600 <div class="paragraph"><p>The idea is to manually tell <em>git rebase</em> "where the old <em>subsystem</em>
1601 ended and your <em>topic</em> began", that is, what the old merge-base
1602 between them was. You will have to find a way to name the last commit
1605 <li>
1606 <p>
1610 </p>
1611 </li>
1612 <li>
1613 <p>
1616 </p>
1617 </li>
1618 </ul></div>
1619 <div class="paragraph"><p>You can then transplant the old <tt>subsystem..topic</tt> to the new tip by
1624 </div></div>
1628 </div>
1631 <div class="paragraph"><p>The todo list presented by <tt>--preserve-merges --interactive</tt> does not
1632 represent the topology of the revision graph. Editing commits and
1633 rewording their commit messages should work fine, but attempts to
1634 reorder commits tend to produce counterintuitive results.</p></div>
1639 </div></div>
1644 </div></div>
1645 <div class="paragraph"><p>by moving the "pick 4" line will result in the following history:</p></div>
1649 /
1651 </div></div>
1652 </div>
1656 </div>
1657 </div>
1662 </div>
1663 </div>
1664 </body>
1665 </html>