12 Dec
2010
12 Dec
'10
9:10 a.m.
Hm, I'm not sure what happened there either. It looks like it fetched origin, but never performed the rebase. What does you .git/config look like?
If you didn't have any unmerged commits on your local 7.9 branch, then you can just "git reset --hard origin/7.9" to get back on track. There should be no need to wipe the tree.