How do I recover/resynchronise after someone pushes a rebase or a reset to a published branch?

by

Getting back in synch after a pushed rebase is really not that complicated in most cases.

git checkout foo
git branch old-foo origin/foo # BEFORE fetching!!
git fetch
git rebase --onto origin/foo old-foo foo
git branch -D old-foo

Ie. first you set up a bookmark for where the remote branch originally was, then you use that to replay your local commits from that point onward onto rebased remote branch.

Rebasing is like violence: if it doesn’t solve your problem, you just need more of it. ☺

You can do this without the bookmark of course, if you look up the pre-rebase origin/foo commit ID, and use that.

This is also how you deal with the situation where you forgot to make a bookmark before fetching. Nothing is lost – you just need to check the reflog for the remote branch:

git reflog show origin/foo | awk '
    PRINT_NEXT==1 { print $1; exit }
    /fetch: forced-update/ { PRINT_NEXT=1 }'

This will print the commit ID that origin/foo pointed to before the most recent fetch that changed its history.

You can then simply

git rebase --onto origin/foo $commit foo

More Related Contents:

  1. Delete commits from a branch in Git
  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. Rebasing a branch including all its children
  10. How to rebase many branches (with the same base commit) at once?
  11. Rebasing a Git merge commit
  12. How do I delete a commit from a branch?
  13. Squash the first two commits in Git? [duplicate]
  14. Change old commit message using `git rebase`
  15. Git interactive rebase without opening the editor
  16. Git: How to rebase to a specific commit?
  17. Git rebase branch with all parent branches (or dependent sub-branches)
  18. How do I revert a Git repository to a previous commit?
  19. How to cherry-pick multiple commits
  20. git rebase without changing commit timestamps
  21. Recover files that were added to the index but then removed by a git reset
  22. Unstaged changes left after git reset –hard
  23. What are the practical consequences of rewriting Git history?
  24. Why are there two ways to unstage a file in Git?
  25. Git push rejected “non-fast-forward”
  26. Why there are two ways to unstage a file in Git?
  27. git reset vs git reset HEAD
  28. Rebasing and what does one mean by rebasing pushed commits
  29. Can tags be automatically moved after a git filter-branch and rebase?
  30. Can I delete a git commit but keep the changes?

Leave a Comment