]> git.ipfire.org Git - thirdparty/git.git/blob - Documentation/git-rebase.txt
doc: typeset long command-line options as literal
[thirdparty/git.git] / Documentation / git-rebase.txt
1 git-rebase(1)
2 =============
3
4 NAME
5 ----
6 git-rebase - Reapply commits on top of another base tip
7
8 SYNOPSIS
9 --------
10 [verse]
11 'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>]
12 [<upstream> [<branch>]]
13 'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>]
14 --root [<branch>]
15 'git rebase' --continue | --skip | --abort | --edit-todo
16
17 DESCRIPTION
18 -----------
19 If <branch> is specified, 'git rebase' will perform an automatic
20 `git checkout <branch>` before doing anything else. Otherwise
21 it remains on the current branch.
22
23 If <upstream> is not specified, the upstream configured in
24 branch.<name>.remote and branch.<name>.merge options will be used (see
25 linkgit:git-config[1] for details) and the `--fork-point` option is
26 assumed. If you are currently not on any branch or if the current
27 branch does not have a configured upstream, the rebase will abort.
28
29 All changes made by commits in the current branch but that are not
30 in <upstream> are saved to a temporary area. This is the same set
31 of commits that would be shown by `git log <upstream>..HEAD`; or by
32 `git log 'fork_point'..HEAD`, if `--fork-point` is active (see the
33 description on `--fork-point` below); or by `git log HEAD`, if the
34 `--root` option is specified.
35
36 The current branch is reset to <upstream>, or <newbase> if the
37 --onto option was supplied. This has the exact same effect as
38 `git reset --hard <upstream>` (or <newbase>). ORIG_HEAD is set
39 to point at the tip of the branch before the reset.
40
41 The commits that were previously saved into the temporary area are
42 then reapplied to the current branch, one by one, in order. Note that
43 any commits in HEAD which introduce the same textual changes as a commit
44 in HEAD..<upstream> are omitted (i.e., a patch already accepted upstream
45 with a different commit message or timestamp will be skipped).
46
47 It is possible that a merge failure will prevent this process from being
48 completely automatic. You will have to resolve any such merge failure
49 and run `git rebase --continue`. Another option is to bypass the commit
50 that caused the merge failure with `git rebase --skip`. To check out the
51 original <branch> and remove the .git/rebase-apply working files, use the
52 command `git rebase --abort` instead.
53
54 Assume the following history exists and the current branch is "topic":
55
56 ------------
57 A---B---C topic
58 /
59 D---E---F---G master
60 ------------
61
62 From this point, the result of either of the following commands:
63
64
65 git rebase master
66 git rebase master topic
67
68 would be:
69
70 ------------
71 A'--B'--C' topic
72 /
73 D---E---F---G master
74 ------------
75
76 *NOTE:* The latter form is just a short-hand of `git checkout topic`
77 followed by `git rebase master`. When rebase exits `topic` will
78 remain the checked-out branch.
79
80 If the upstream branch already contains a change you have made (e.g.,
81 because you mailed a patch which was applied upstream), then that commit
82 will be skipped. For example, running `git rebase master` on the
83 following history (in which `A'` and `A` introduce the same set of changes,
84 but have different committer information):
85
86 ------------
87 A---B---C topic
88 /
89 D---E---A'---F master
90 ------------
91
92 will result in:
93
94 ------------
95 B'---C' topic
96 /
97 D---E---A'---F master
98 ------------
99
100 Here is how you would transplant a topic branch based on one
101 branch to another, to pretend that you forked the topic branch
102 from the latter branch, using `rebase --onto`.
103
104 First let's assume your 'topic' is based on branch 'next'.
105 For example, a feature developed in 'topic' depends on some
106 functionality which is found in 'next'.
107
108 ------------
109 o---o---o---o---o master
110 \
111 o---o---o---o---o next
112 \
113 o---o---o topic
114 ------------
115
116 We want to make 'topic' forked from branch 'master'; for example,
117 because the functionality on which 'topic' depends was merged into the
118 more stable 'master' branch. We want our tree to look like this:
119
120 ------------
121 o---o---o---o---o master
122 | \
123 | o'--o'--o' topic
124 \
125 o---o---o---o---o next
126 ------------
127
128 We can get this using the following command:
129
130 git rebase --onto master next topic
131
132
133 Another example of --onto option is to rebase part of a
134 branch. If we have the following situation:
135
136 ------------
137 H---I---J topicB
138 /
139 E---F---G topicA
140 /
141 A---B---C---D master
142 ------------
143
144 then the command
145
146 git rebase --onto master topicA topicB
147
148 would result in:
149
150 ------------
151 H'--I'--J' topicB
152 /
153 | E---F---G topicA
154 |/
155 A---B---C---D master
156 ------------
157
158 This is useful when topicB does not depend on topicA.
159
160 A range of commits could also be removed with rebase. If we have
161 the following situation:
162
163 ------------
164 E---F---G---H---I---J topicA
165 ------------
166
167 then the command
168
169 git rebase --onto topicA~5 topicA~3 topicA
170
171 would result in the removal of commits F and G:
172
173 ------------
174 E---H'---I'---J' topicA
175 ------------
176
177 This is useful if F and G were flawed in some way, or should not be
178 part of topicA. Note that the argument to --onto and the <upstream>
179 parameter can be any valid commit-ish.
180
181 In case of conflict, 'git rebase' will stop at the first problematic commit
182 and leave conflict markers in the tree. You can use 'git diff' to locate
183 the markers (<<<<<<) and make edits to resolve the conflict. For each
184 file you edit, you need to tell Git that the conflict has been resolved,
185 typically this would be done with
186
187
188 git add <filename>
189
190
191 After resolving the conflict manually and updating the index with the
192 desired resolution, you can continue the rebasing process with
193
194
195 git rebase --continue
196
197
198 Alternatively, you can undo the 'git rebase' with
199
200
201 git rebase --abort
202
203 CONFIGURATION
204 -------------
205
206 rebase.stat::
207 Whether to show a diffstat of what changed upstream since the last
208 rebase. False by default.
209
210 rebase.autoSquash::
211 If set to true enable `--autosquash` option by default.
212
213 rebase.autoStash::
214 If set to true enable `--autostash` option by default.
215
216 rebase.missingCommitsCheck::
217 If set to "warn", print warnings about removed commits in
218 interactive mode. If set to "error", print the warnings and
219 stop the rebase. If set to "ignore", no checking is
220 done. "ignore" by default.
221
222 rebase.instructionFormat::
223 Custom commit list format to use during an `--interactive` rebase.
224
225 OPTIONS
226 -------
227 --onto <newbase>::
228 Starting point at which to create the new commits. If the
229 --onto option is not specified, the starting point is
230 <upstream>. May be any valid commit, and not just an
231 existing branch name.
232 +
233 As a special case, you may use "A\...B" as a shortcut for the
234 merge base of A and B if there is exactly one merge base. You can
235 leave out at most one of A and B, in which case it defaults to HEAD.
236
237 <upstream>::
238 Upstream branch to compare against. May be any valid commit,
239 not just an existing branch name. Defaults to the configured
240 upstream for the current branch.
241
242 <branch>::
243 Working branch; defaults to HEAD.
244
245 --continue::
246 Restart the rebasing process after having resolved a merge conflict.
247
248 --abort::
249 Abort the rebase operation and reset HEAD to the original
250 branch. If <branch> was provided when the rebase operation was
251 started, then HEAD will be reset to <branch>. Otherwise HEAD
252 will be reset to where it was when the rebase operation was
253 started.
254
255 --keep-empty::
256 Keep the commits that do not change anything from its
257 parents in the result.
258
259 --skip::
260 Restart the rebasing process by skipping the current patch.
261
262 --edit-todo::
263 Edit the todo list during an interactive rebase.
264
265 -m::
266 --merge::
267 Use merging strategies to rebase. When the recursive (default) merge
268 strategy is used, this allows rebase to be aware of renames on the
269 upstream side.
270 +
271 Note that a rebase merge works by replaying each commit from the working
272 branch on top of the <upstream> branch. Because of this, when a merge
273 conflict happens, the side reported as 'ours' is the so-far rebased
274 series, starting with <upstream>, and 'theirs' is the working branch. In
275 other words, the sides are swapped.
276
277 -s <strategy>::
278 --strategy=<strategy>::
279 Use the given merge strategy.
280 If there is no `-s` option 'git merge-recursive' is used
281 instead. This implies --merge.
282 +
283 Because 'git rebase' replays each commit from the working branch
284 on top of the <upstream> branch using the given strategy, using
285 the 'ours' strategy simply discards all patches from the <branch>,
286 which makes little sense.
287
288 -X <strategy-option>::
289 --strategy-option=<strategy-option>::
290 Pass the <strategy-option> through to the merge strategy.
291 This implies `--merge` and, if no strategy has been
292 specified, `-s recursive`. Note the reversal of 'ours' and
293 'theirs' as noted above for the `-m` option.
294
295 -S[<keyid>]::
296 --gpg-sign[=<keyid>]::
297 GPG-sign commits. The `keyid` argument is optional and
298 defaults to the committer identity; if specified, it must be
299 stuck to the option without a space.
300
301 -q::
302 --quiet::
303 Be quiet. Implies --no-stat.
304
305 -v::
306 --verbose::
307 Be verbose. Implies --stat.
308
309 --stat::
310 Show a diffstat of what changed upstream since the last rebase. The
311 diffstat is also controlled by the configuration option rebase.stat.
312
313 -n::
314 --no-stat::
315 Do not show a diffstat as part of the rebase process.
316
317 --no-verify::
318 This option bypasses the pre-rebase hook. See also linkgit:githooks[5].
319
320 --verify::
321 Allows the pre-rebase hook to run, which is the default. This option can
322 be used to override --no-verify. See also linkgit:githooks[5].
323
324 -C<n>::
325 Ensure at least <n> lines of surrounding context match before
326 and after each change. When fewer lines of surrounding
327 context exist they all must match. By default no context is
328 ever ignored.
329
330 -f::
331 --force-rebase::
332 Force a rebase even if the current branch is up-to-date and
333 the command without `--force` would return without doing anything.
334 +
335 You may find this (or --no-ff with an interactive rebase) helpful after
336 reverting a topic branch merge, as this option recreates the topic branch with
337 fresh commits so it can be remerged successfully without needing to "revert
338 the reversion" (see the
339 link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details).
340
341 --fork-point::
342 --no-fork-point::
343 Use reflog to find a better common ancestor between <upstream>
344 and <branch> when calculating which commits have been
345 introduced by <branch>.
346 +
347 When --fork-point is active, 'fork_point' will be used instead of
348 <upstream> to calculate the set of commits to rebase, where
349 'fork_point' is the result of `git merge-base --fork-point <upstream>
350 <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point'
351 ends up being empty, the <upstream> will be used as a fallback.
352 +
353 If either <upstream> or --root is given on the command line, then the
354 default is `--no-fork-point`, otherwise the default is `--fork-point`.
355
356 --ignore-whitespace::
357 --whitespace=<option>::
358 These flag are passed to the 'git apply' program
359 (see linkgit:git-apply[1]) that applies the patch.
360 Incompatible with the --interactive option.
361
362 --committer-date-is-author-date::
363 --ignore-date::
364 These flags are passed to 'git am' to easily change the dates
365 of the rebased commits (see linkgit:git-am[1]).
366 Incompatible with the --interactive option.
367
368 -i::
369 --interactive::
370 Make a list of the commits which are about to be rebased. Let the
371 user edit that list before rebasing. This mode can also be used to
372 split commits (see SPLITTING COMMITS below).
373 +
374 The commit list format can be changed by setting the configuration option
375 rebase.instructionFormat. A customized instruction format will automatically
376 have the long commit hash prepended to the format.
377
378 -p::
379 --preserve-merges::
380 Recreate merge commits instead of flattening the history by replaying
381 commits a merge commit introduces. Merge conflict resolutions or manual
382 amendments to merge commits are not preserved.
383 +
384 This uses the `--interactive` machinery internally, but combining it
385 with the `--interactive` option explicitly is generally not a good
386 idea unless you know what you are doing (see BUGS below).
387
388 -x <cmd>::
389 --exec <cmd>::
390 Append "exec <cmd>" after each line creating a commit in the
391 final history. <cmd> will be interpreted as one or more shell
392 commands.
393 +
394 This option can only be used with the `--interactive` option
395 (see INTERACTIVE MODE below).
396 +
397 You may execute several commands by either using one instance of `--exec`
398 with several commands:
399 +
400 git rebase -i --exec "cmd1 && cmd2 && ..."
401 +
402 or by giving more than one `--exec`:
403 +
404 git rebase -i --exec "cmd1" --exec "cmd2" --exec ...
405 +
406 If `--autosquash` is used, "exec" lines will not be appended for
407 the intermediate commits, and will only appear at the end of each
408 squash/fixup series.
409
410 --root::
411 Rebase all commits reachable from <branch>, instead of
412 limiting them with an <upstream>. This allows you to rebase
413 the root commit(s) on a branch. When used with --onto, it
414 will skip changes already contained in <newbase> (instead of
415 <upstream>) whereas without --onto it will operate on every change.
416 When used together with both --onto and --preserve-merges,
417 'all' root commits will be rewritten to have <newbase> as parent
418 instead.
419
420 --autosquash::
421 --no-autosquash::
422 When the commit log message begins with "squash! ..." (or
423 "fixup! ..."), and there is a commit whose title begins with
424 the same ..., automatically modify the todo list of rebase -i
425 so that the commit marked for squashing comes right after the
426 commit to be modified, and change the action of the moved
427 commit from `pick` to `squash` (or `fixup`). Ignores subsequent
428 "fixup! " or "squash! " after the first, in case you referred to an
429 earlier fixup/squash with `git commit --fixup/--squash`.
430 +
431 This option is only valid when the `--interactive` option is used.
432 +
433 If the `--autosquash` option is enabled by default using the
434 configuration variable `rebase.autoSquash`, this option can be
435 used to override and disable this setting.
436
437 --autostash::
438 --no-autostash::
439 Automatically create a temporary stash before the operation
440 begins, and apply it after the operation ends. This means
441 that you can run rebase on a dirty worktree. However, use
442 with care: the final stash application after a successful
443 rebase might result in non-trivial conflicts.
444
445 --no-ff::
446 With --interactive, cherry-pick all rebased commits instead of
447 fast-forwarding over the unchanged ones. This ensures that the
448 entire history of the rebased branch is composed of new commits.
449 +
450 Without --interactive, this is a synonym for --force-rebase.
451 +
452 You may find this helpful after reverting a topic branch merge, as this option
453 recreates the topic branch with fresh commits so it can be remerged
454 successfully without needing to "revert the reversion" (see the
455 link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details).
456
457 include::merge-strategies.txt[]
458
459 NOTES
460 -----
461
462 You should understand the implications of using 'git rebase' on a
463 repository that you share. See also RECOVERING FROM UPSTREAM REBASE
464 below.
465
466 When the git-rebase command is run, it will first execute a "pre-rebase"
467 hook if one exists. You can use this hook to do sanity checks and
468 reject the rebase if it isn't appropriate. Please see the template
469 pre-rebase hook script for an example.
470
471 Upon completion, <branch> will be the current branch.
472
473 INTERACTIVE MODE
474 ----------------
475
476 Rebasing interactively means that you have a chance to edit the commits
477 which are rebased. You can reorder the commits, and you can
478 remove them (weeding out bad or otherwise unwanted patches).
479
480 The interactive mode is meant for this type of workflow:
481
482 1. have a wonderful idea
483 2. hack on the code
484 3. prepare a series for submission
485 4. submit
486
487 where point 2. consists of several instances of
488
489 a) regular use
490
491 1. finish something worthy of a commit
492 2. commit
493
494 b) independent fixup
495
496 1. realize that something does not work
497 2. fix that
498 3. commit it
499
500 Sometimes the thing fixed in b.2. cannot be amended to the not-quite
501 perfect commit it fixes, because that commit is buried deeply in a
502 patch series. That is exactly what interactive rebase is for: use it
503 after plenty of "a"s and "b"s, by rearranging and editing
504 commits, and squashing multiple commits into one.
505
506 Start it with the last commit you want to retain as-is:
507
508 git rebase -i <after-this-commit>
509
510 An editor will be fired up with all the commits in your current branch
511 (ignoring merge commits), which come after the given commit. You can
512 reorder the commits in this list to your heart's content, and you can
513 remove them. The list looks more or less like this:
514
515 -------------------------------------------
516 pick deadbee The oneline of this commit
517 pick fa1afe1 The oneline of the next commit
518 ...
519 -------------------------------------------
520
521 The oneline descriptions are purely for your pleasure; 'git rebase' will
522 not look at them but at the commit names ("deadbee" and "fa1afe1" in this
523 example), so do not delete or edit the names.
524
525 By replacing the command "pick" with the command "edit", you can tell
526 'git rebase' to stop after applying that commit, so that you can edit
527 the files and/or the commit message, amend the commit, and continue
528 rebasing.
529
530 If you just want to edit the commit message for a commit, replace the
531 command "pick" with the command "reword".
532
533 To drop a commit, replace the command "pick" with "drop", or just
534 delete the matching line.
535
536 If you want to fold two or more commits into one, replace the command
537 "pick" for the second and subsequent commits with "squash" or "fixup".
538 If the commits had different authors, the folded commit will be
539 attributed to the author of the first commit. The suggested commit
540 message for the folded commit is the concatenation of the commit
541 messages of the first commit and of those with the "squash" command,
542 but omits the commit messages of commits with the "fixup" command.
543
544 'git rebase' will stop when "pick" has been replaced with "edit" or
545 when a command fails due to merge errors. When you are done editing
546 and/or resolving conflicts you can continue with `git rebase --continue`.
547
548 For example, if you want to reorder the last 5 commits, such that what
549 was HEAD~4 becomes the new HEAD. To achieve that, you would call
550 'git rebase' like this:
551
552 ----------------------
553 $ git rebase -i HEAD~5
554 ----------------------
555
556 And move the first patch to the end of the list.
557
558 You might want to preserve merges, if you have a history like this:
559
560 ------------------
561 X
562 \
563 A---M---B
564 /
565 ---o---O---P---Q
566 ------------------
567
568 Suppose you want to rebase the side branch starting at "A" to "Q". Make
569 sure that the current HEAD is "B", and call
570
571 -----------------------------
572 $ git rebase -i -p --onto Q O
573 -----------------------------
574
575 Reordering and editing commits usually creates untested intermediate
576 steps. You may want to check that your history editing did not break
577 anything by running a test, or at least recompiling at intermediate
578 points in history by using the "exec" command (shortcut "x"). You may
579 do so by creating a todo list like this one:
580
581 -------------------------------------------
582 pick deadbee Implement feature XXX
583 fixup f1a5c00 Fix to feature XXX
584 exec make
585 pick c0ffeee The oneline of the next commit
586 edit deadbab The oneline of the commit after
587 exec cd subdir; make test
588 ...
589 -------------------------------------------
590
591 The interactive rebase will stop when a command fails (i.e. exits with
592 non-0 status) to give you an opportunity to fix the problem. You can
593 continue with `git rebase --continue`.
594
595 The "exec" command launches the command in a shell (the one specified
596 in `$SHELL`, or the default shell if `$SHELL` is not set), so you can
597 use shell features (like "cd", ">", ";" ...). The command is run from
598 the root of the working tree.
599
600 ----------------------------------
601 $ git rebase -i --exec "make test"
602 ----------------------------------
603
604 This command lets you check that intermediate commits are compilable.
605 The todo list becomes like that:
606
607 --------------------
608 pick 5928aea one
609 exec make test
610 pick 04d0fda two
611 exec make test
612 pick ba46169 three
613 exec make test
614 pick f4593f9 four
615 exec make test
616 --------------------
617
618 SPLITTING COMMITS
619 -----------------
620
621 In interactive mode, you can mark commits with the action "edit". However,
622 this does not necessarily mean that 'git rebase' expects the result of this
623 edit to be exactly one commit. Indeed, you can undo the commit, or you can
624 add other commits. This can be used to split a commit into two:
625
626 - Start an interactive rebase with `git rebase -i <commit>^`, where
627 <commit> is the commit you want to split. In fact, any commit range
628 will do, as long as it contains that commit.
629
630 - Mark the commit you want to split with the action "edit".
631
632 - When it comes to editing that commit, execute `git reset HEAD^`. The
633 effect is that the HEAD is rewound by one, and the index follows suit.
634 However, the working tree stays the same.
635
636 - Now add the changes to the index that you want to have in the first
637 commit. You can use `git add` (possibly interactively) or
638 'git gui' (or both) to do that.
639
640 - Commit the now-current index with whatever commit message is appropriate
641 now.
642
643 - Repeat the last two steps until your working tree is clean.
644
645 - Continue the rebase with `git rebase --continue`.
646
647 If you are not absolutely sure that the intermediate revisions are
648 consistent (they compile, pass the testsuite, etc.) you should use
649 'git stash' to stash away the not-yet-committed changes
650 after each commit, test, and amend the commit if fixes are necessary.
651
652
653 RECOVERING FROM UPSTREAM REBASE
654 -------------------------------
655
656 Rebasing (or any other form of rewriting) a branch that others have
657 based work on is a bad idea: anyone downstream of it is forced to
658 manually fix their history. This section explains how to do the fix
659 from the downstream's point of view. The real fix, however, would be
660 to avoid rebasing the upstream in the first place.
661
662 To illustrate, suppose you are in a situation where someone develops a
663 'subsystem' branch, and you are working on a 'topic' that is dependent
664 on this 'subsystem'. You might end up with a history like the
665 following:
666
667 ------------
668 o---o---o---o---o---o---o---o---o master
669 \
670 o---o---o---o---o subsystem
671 \
672 *---*---* topic
673 ------------
674
675 If 'subsystem' is rebased against 'master', the following happens:
676
677 ------------
678 o---o---o---o---o---o---o---o master
679 \ \
680 o---o---o---o---o o'--o'--o'--o'--o' subsystem
681 \
682 *---*---* topic
683 ------------
684
685 If you now continue development as usual, and eventually merge 'topic'
686 to 'subsystem', the commits from 'subsystem' will remain duplicated forever:
687
688 ------------
689 o---o---o---o---o---o---o---o master
690 \ \
691 o---o---o---o---o o'--o'--o'--o'--o'--M subsystem
692 \ /
693 *---*---*-..........-*--* topic
694 ------------
695
696 Such duplicates are generally frowned upon because they clutter up
697 history, making it harder to follow. To clean things up, you need to
698 transplant the commits on 'topic' to the new 'subsystem' tip, i.e.,
699 rebase 'topic'. This becomes a ripple effect: anyone downstream from
700 'topic' is forced to rebase too, and so on!
701
702 There are two kinds of fixes, discussed in the following subsections:
703
704 Easy case: The changes are literally the same.::
705
706 This happens if the 'subsystem' rebase was a simple rebase and
707 had no conflicts.
708
709 Hard case: The changes are not the same.::
710
711 This happens if the 'subsystem' rebase had conflicts, or used
712 `--interactive` to omit, edit, squash, or fixup commits; or
713 if the upstream used one of `commit --amend`, `reset`, or
714 `filter-branch`.
715
716
717 The easy case
718 ~~~~~~~~~~~~~
719
720 Only works if the changes (patch IDs based on the diff contents) on
721 'subsystem' are literally the same before and after the rebase
722 'subsystem' did.
723
724 In that case, the fix is easy because 'git rebase' knows to skip
725 changes that are already present in the new upstream. So if you say
726 (assuming you're on 'topic')
727 ------------
728 $ git rebase subsystem
729 ------------
730 you will end up with the fixed history
731 ------------
732 o---o---o---o---o---o---o---o master
733 \
734 o'--o'--o'--o'--o' subsystem
735 \
736 *---*---* topic
737 ------------
738
739
740 The hard case
741 ~~~~~~~~~~~~~
742
743 Things get more complicated if the 'subsystem' changes do not exactly
744 correspond to the ones before the rebase.
745
746 NOTE: While an "easy case recovery" sometimes appears to be successful
747 even in the hard case, it may have unintended consequences. For
748 example, a commit that was removed via `git rebase
749 --interactive` will be **resurrected**!
750
751 The idea is to manually tell 'git rebase' "where the old 'subsystem'
752 ended and your 'topic' began", that is, what the old merge-base
753 between them was. You will have to find a way to name the last commit
754 of the old 'subsystem', for example:
755
756 * With the 'subsystem' reflog: after 'git fetch', the old tip of
757 'subsystem' is at `subsystem@{1}`. Subsequent fetches will
758 increase the number. (See linkgit:git-reflog[1].)
759
760 * Relative to the tip of 'topic': knowing that your 'topic' has three
761 commits, the old tip of 'subsystem' must be `topic~3`.
762
763 You can then transplant the old `subsystem..topic` to the new tip by
764 saying (for the reflog case, and assuming you are on 'topic' already):
765 ------------
766 $ git rebase --onto subsystem subsystem@{1}
767 ------------
768
769 The ripple effect of a "hard case" recovery is especially bad:
770 'everyone' downstream from 'topic' will now have to perform a "hard
771 case" recovery too!
772
773 BUGS
774 ----
775 The todo list presented by `--preserve-merges --interactive` does not
776 represent the topology of the revision graph. Editing commits and
777 rewording their commit messages should work fine, but attempts to
778 reorder commits tend to produce counterintuitive results.
779
780 For example, an attempt to rearrange
781 ------------
782 1 --- 2 --- 3 --- 4 --- 5
783 ------------
784 to
785 ------------
786 1 --- 2 --- 4 --- 3 --- 5
787 ------------
788 by moving the "pick 4" line will result in the following history:
789 ------------
790 3
791 /
792 1 --- 2 --- 4 --- 5
793 ------------
794
795 GIT
796 ---
797 Part of the linkgit:git[1] suite