Branches have apparently diverged, but commit history is identical

Question

git status tells me that my branch and the one I started from on another repository have diverged:

# On branch master
# Your branch and \'origin/mas         


        

Answer 1

It looks like you also forgot to update remote repositories. So do git remote update in rep_A (it will probably warn it is not fast-forward update as you seem to do rebase on both ends) and then the histories should be identical.