Re: How to fix “Your branch and 'origin/master' have diverged” after editing a commit that came before a pull?

> To fix it, what you want to do is recreate the history on top of B' as
> it happened on top of B. So first you go back to C', the last commit
> just before the commits from upstream that were rewritten. (you will
> have pick its sha1 out of the log):
>
>  git checkout -b temp B'

> You should then have:
>
>  A--B'--C'
>
> on a temporary branch. Now re-pull from upstream (you could also
> manually rebase those commits, but this is probably simpler, especially
> if there actually was a merge):
>
>  git pull remote_name branch_name
>
> Note that you need to explicitly mention where you pulled from, since
> the temp branch will not be configured to pull in the same way (if you
> don't have any special config set up, it should be "git pull origin
> master").
>
> And now you have:
>
>  A--B'--C'--D--E
>
> at which point we can rebase the last bit of your branch on top:
>
>  git rebase --onto temp F'^ branch_name
>
> where "branch_name" is the name of the branch where this mess happened
> (presumably "master"), and F' is the first commit that is worth saving
> after you pulled from upstream. And that gives you:
>
>  A--B'--C'--D--E--F''--G''--H''
>
> where F'' corresponds to the original F, but actually has a different
> commit id (because of different parentage) than F or F'.
>
> At that point your original branch should be in the state you want. You
> can delete the temp branch with "git branch -D temp".