From: Joakim Tjernlund <joakim.tjernlund@transmode.se>
Date: Sat, 17 Mar 2012 12:57:47 GMT
Subject: rebase problem
Message-ID: <OF506B5658.3E449452-ONC12579C4.00460A6E-C12579C4.0047355D@transmode.se>


A co-worker this on our local u-boot repo:
  git checkout master
  git fetch denx/master
  git merge denx/master
<resolve conflicts>
  git commit
  ...
  git commit
Now u-boot is working again
then update to latest u-boot so:
  git fetch denx/master
  git rebase denx/master
Now it is a mess, that rebase seems to start from way back as a
staring reference, not from the last merge shown above.
I guess I forgotten how git works, what did go wrong?

  Jocke