Git rebase branch with all parent branches (or dependent sub-branches)

by

According to git’s Object Model if you only change the meta-data of a commit (i.e. commit message) but not the underlying data (“tree(s)”) contained within it then it’s Tree hash will remain unchanged.

Aside from editing a commit message, you are also performing a rebase, which will change the Tree hashes of each commit in your history, because any changes pulled from origin/master will affect the files in your re-written history: which means some of the files (blobs) that your commit points to have changed.

So there is no bullet-proof way to do what you want.

That said, editing a commit with rebase -i does not usually alter the commit’s timestamp and author, so you could use this to uniquely identify your commits before and after a rebase operation.

You would have to write a script which records all the branch start-points against these “timestamp:author” identifier before doing a rebase, and then find the rewritten commits with the same “timestamp:author” ID and rebase the branch on it.

Sadly, I don’t have time to try writing this script myself now, so I can only wish you the best of luck!

Edit: You can obtain the author email address and timestamp using:

$ git log --graph --all --pretty=format:"%h %ae:%ci"
* 53ca31a [email protected]:2010-06-16 13:50:12 +0100
* 03dda75 [email protected]:2010-06-16 13:50:11 +0100
| * a8bb03a [email protected]:2010-06-16 13:49:46 +0100
| * b93e59d [email protected]:2010-06-16 13:49:44 +0100
|/
* d4214a2 [email protected]:2010-06-16 13:49:41 +0100

And you can obtain a list of branches for each of these based on their commit hash:

$ git branch --contains 03dda75
* testbranch

Watch out for multiple branches per commit, the common ancestor d4214a2 belongs to both branches!

More Related Contents:

  1. Rebasing a branch including all its children
  2. Undoing a git rebase
  3. What is the difference between merge –squash and rebase?
  4. How to squash all git commits into one?
  5. Insert a commit before the root commit in Git?
  6. What’s the difference between ‘git merge’ and ‘git rebase’?
  7. Combine the first two commits of a Git repository?
  8. Remove folder and its contents from git/GitHub’s history
  9. How do I recover/resynchronise after someone pushes a rebase or a reset to a published branch?
  10. How to rebase many branches (with the same base commit) at once?
  11. Rebasing a Git merge commit
  12. Squash the first two commits in Git? [duplicate]
  13. Can I make fast forwarding be off by default in git?
  14. Git commits are duplicated in the same branch after doing a rebase
  15. Change old commit message using `git rebase`
  16. Git interactive rebase without opening the editor
  17. Git: How to rebase to a specific commit?
  18. Git workflow and rebase vs merge questions
  19. How to squash my last x commits together?
  20. Pull a certain branch from the remote server
  21. Git branch strategy for small dev team [closed]
  22. Delete local Git branches after deleting them on the remote repo
  23. Git rebase fails, ‘Your local changes to the following files would be overwritten by merge’. No local changes?
  24. How to protect “master” in github?
  25. git rebase: “error: cannot stat ‘file’: Permission denied”
  26. View differences of branches with meld?
  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. Can tags be automatically moved after a git filter-branch and rebase?

Leave a Comment