Reordering of commits

by

The command you’re looking for is git rebase, specifically the -i/--interactive option.

I’m going to assume you want to leave commit c on branch A, and that you really do mean you want to move the other commits to the other branches, rather than merging, since merges are straightforward. Let’s start by manipulating branch A.

git rebase -i <SHA1 of commit a>^ branchA

The ^ means the previous commit, so this command says to rebase branch A using the commit before “a” as the base. Git will present you with a list of the commits in this range. Reorder them and tell git to squash the appropriate ones:

pick c ...
pick a ...
squash d ...
squash e ...
squash g ...
pick b
squash f

Now the history should look like this:

    c - [a+d+e+g] - [b+f] (branchA)
   /
--o-x-x-x-x-x-x-x-x-x-x (master)

Now, let’s grab the newly-squashed commit b+f for branchB.

git checkout branchB
git cherry-pick branchA  # cherry-pick one commit, the tip of branchA

And the same for a+d+e+g for master:

git checkout master
git cherry-pick branchA^

Finally, update branchA so it points to c:

git branch -f branchA branchA^^

We should now have:

    c (branch A) - [a+d+e+g] - [b+f] (dangling commits)
   /
--o-x-x-x-x-x-x-x-x-x-x-[a+d+e+g] (master)
   \
    x-x-x-x-x-[b+f] (branchB)

Note that if you had multiple commits you wanted to move between branches, you could use rebase again (non-interactively):

# create a temporary branch
git branch fromAtoB branchA
# move branchA back two commits
git branch -f branchA branchA~2
# rebase those two commits onto branchB
git rebase --onto branchB branchA fromAtoB
# merge (fast-forward) these into branchB
git checkout branchB
git merge fromAtoB
# clean up
git branch -d fromAtoB

Finally, a disclaimer: It’s quite possible to reorder commits in such a way that some no longer apply cleanly. This could be because you chose a bad order (putting a patch before the commit introducing the feature it patched); in that case you’ll want to abort the rebase (git rebase --abort). Otherwise, you’ll have to intelligently fix the conflicts (just as you do with merge conflicts), add the fixes, then run git rebase --continue to move on. These instructions are also provided by the error message printed when the conflict occurs.

More Related Contents:

  1. Branch from a previous commit using Git
  2. What exactly do we mean by “branch”?
  3. How do I clone a single branch in Git?
  4. Default behavior of “git push” without a branch specified
  5. Track all remote git branches as local branches
  6. Using the slash character in Git branch name
  7. Why do I have to “git push –set-upstream origin “?
  8. Vendor Branches in Git
  9. How can I search Git branches for a file or directory?
  10. Forking vs. Branching in GitHub
  11. How do I get the current branch name in Git?
  12. How do I create a remote Git branch?
  13. How do I delete all Git branches which have been merged?
  14. How do I merge my local uncommitted changes into another Git branch?
  15. How to commit my current changes to a different branch in Git [duplicate]
  16. Pull a certain branch from the remote server
  17. Does deleting a branch in git remove it from the history?
  18. git: Switch branch and ignore any changes without committing
  19. How do you remove an invalid remote branch reference from Git?
  20. Branching: different config files for release/development
  21. How to get default Git branch?
  22. Switch branch and ignore any changes without committing
  23. main branch and ‘origin/main’ have diverged, how to ‘undiverge’ branches’?
  24. How do I list all remote branches in Git 1.7+?
  25. How do I create a new Git branch from an old commit? [duplicate]
  26. In git, how do I remove a commit from one branch and apply it to a different branch?
  27. How do I run git log to see changes only for a specific branch?
  28. git push error: src refspec main does not match any on linux
  29. git branch permissions
  30. Commit a file to a Different Branch Without Checkout

Leave a Comment