When git rebasing two branches with some shared history, is there an easy way to have the common history remain common?

by 
git rebase --committer-date-is-author-date --preserve-merges --onto A* A C
git rebase --committer-date-is-author-date --preserve-merges --onto A* A B

This should keep the common commits having the same sha1 and any merges preserved. Preserve merges is not required in this case, but will become an issue with a less trivial history.

To do this for all branches that contain A in their history do:

git branch --contains A | xargs -n 1 git rebase --committer-date-is-author-date --preserve-merges --onto A* A

Hope this helps.

UPDATE:

This may be cleaner syntax:

for branch in $(git branch --contains A); do git rebase --committer-date-is-author-date --preserve-merges --onto A* A $branch; done

More Related Contents:

  1. Undoing a git rebase
  2. What is the difference between merge –squash and rebase?
  3. How to squash all git commits into one?
  4. Insert a commit before the root commit in Git?
  5. What’s the difference between ‘git merge’ and ‘git rebase’?
  6. Combine the first two commits of a Git repository?
  7. Remove folder and its contents from git/GitHub’s history
  8. Rebasing a branch including all its children
  9. How do I recover/resynchronise after someone pushes a rebase or a reset to a published branch?
  10. How to git rebase a branch with the onto command?
  11. How to inject a commit between some two arbitrary commits in the past?
  12. Rebasing a Git merge commit
  13. How do I delete a commit from a branch?
  14. Squash the first two commits in Git? [duplicate]
  15. How to identify conflicting commits by hash during git rebase?
  16. Change old commit message using `git rebase`
  17. Git rebase fails, ‘Your local changes to the following files would be overwritten by merge’. No local changes?
  18. What is the difference between git pull and git fetch + git rebase?
  19. How do I squash two non-consecutive commits?
  20. How do I select a merge strategy for a git rebase?
  21. Rebase feature branch onto another feature branch
  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 merge conflict
  28. Git rebase branch with all parent branches (or dependent sub-branches)
  29. How to retain commit gpg-signature after interactive rebase squashing?
  30. Can tags be automatically moved after a git filter-branch and rebase?

Leave a Comment