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