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