Rebase feature branch onto another feature branch

by

  1. Switch to Branch2

    git checkout Branch2

  2. Apply the current (Branch2) changes on top of the Branch1 changes, staying
    in Branch2:

    git rebase Branch1

Which would leave you with the desired result in Branch2: 

a -- b -- c                      <-- Master
           \
            d -- e               <-- Branch1
           \
            d -- e -- f' -- g'   <-- Branch2

You can delete Branch1.

More Related Contents:

  1. Undoing a git rebase
  2. How can I delete all Git branches which have been merged?
  3. How to squash all git commits into one?
  4. What’s the difference between ‘git merge’ and ‘git rebase’?
  5. Combine the first two commits of a Git repository?
  6. Remove folder and its contents from git/GitHub’s history
  7. How do I run git rebase –interactive in non-interactive manner?
  8. git rebase without changing commit timestamps
  9. Rebasing a branch including all its children
  10. How do I recover/resynchronise after someone pushes a rebase or a reset to a published branch?
  11. How to inject a commit between some two arbitrary commits in the past?
  12. How do I delete a commit from a branch?
  13. Squash the first two commits in Git? [duplicate]
  14. What are the practical consequences of rewriting Git history?
  15. Git merge hotfix branch into feature branch
  16. When git rebasing two branches with some shared history, is there an easy way to have the common history remain common?
  17. How to identify conflicting commits by hash during git rebase?
  18. Change old commit message using `git rebase`
  19. What is the difference between git pull and git fetch + git rebase?
  20. How do I squash two non-consecutive commits?
  21. How do I select a merge strategy for a git rebase?
  22. Your branch is ahead of ‘origin/master’ by 3 commits
  23. How do I git rebase the first commit?
  24. Git interactive rebase without opening the editor
  25. git rebase: “error: cannot stat ‘file’: Permission denied”
  26. Git: How to rebase to a specific commit?
  27. Git rebase branch with all parent branches (or dependent sub-branches)
  28. What does “Auto packing the repository for optimum performance” mean?
  29. How to retain commit gpg-signature after interactive rebase squashing?
  30. Git rebase –preserve-merges fails

Leave a Comment