How to move certain commits to be based on another branch in git?

by

This is a classic case of rebase --onto:

 # let's go to current master (X, where quickfix2 should begin)
 git checkout master

 # replay every commit *after* quickfix1 up to quickfix2 HEAD.
 git rebase --onto master quickfix1 quickfix2

So you should go from

o-o-X (master HEAD)
     \ 
      q1a--q1b (quickfix1 HEAD)
              \
               q2a--q2b (quickfix2 HEAD)

to:

      q2a'--q2b' (new quickfix2 HEAD)
     /
o-o-X (master HEAD)
     \ 
      q1a--q1b (quickfix1 HEAD)

This is best done on a clean working tree.
See git config --global rebase.autostash true, especially after Git 2.10.

More Related Contents:

  1. Git: How can I find a commit that most closely matches a directory?
  2. How to configure Git post commit hook
  3. Updates were rejected because the remote contains work that you do not have locally
  4. How can one change the timestamp of an old commit in Git?
  5. How can I push a specific commit to a remote, and not previous commits?
  6. How can I generate a Git patch for a specific commit?
  7. Git: How to ignore fast forward and revert origin [branch] to earlier commit?
  8. How to undo “git commit –amend” done instead of “git commit”
  9. How can I view prior commits with git blame?
  10. git: patch does not apply
  11. How to find the commit in which a given file was added?
  12. How to apply a patch generated with git format-patch?
  13. How to commit my current changes to a different branch in Git [duplicate]
  14. How to amend a commit without changing commit message (reusing the previous one)?
  15. Install specific git commit with pip
  16. How to apply a git patch from one repository to another?
  17. Error “Updates were rejected because the remote contains work that you do not have locally”
  18. How do I create a new Git branch from an old commit? [duplicate]
  19. How to delete the last n commits on Github and locally?
  20. How to commit no change and new message?
  21. git find fat commit
  22. Git: How to create patches for a merge?
  23. How do we verify commit messages for a push?
  24. Git: Merge a Commit into a different Branch
  25. Editing the git commit message in GitHub
  26. GIT commit as different user without email / or only email
  27. How to apply a Git patch to a file with a different name and path?
  28. Add commits before root commit in Git? [duplicate]
  29. Git remove root commit
  30. How do you squash commits into one patch with git format-patch?

Leave a Comment