On Fri, Oct 9, 2009 at 11:04 PM, Mark Kretschmann <span dir="ltr"><<a href="mailto:kretschmann@kde.org">kretschmann@kde.org</a>></span> wrote:<br><div class="gmail_quote"><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<div class="im">On Fri, Oct 9, 2009 at 10:16 PM, <<a href="mailto:magnus.bergmark@gmail.com">magnus.bergmark@gmail.com</a>> wrote:<br>
> Make sure you haven't staged anything. Does git status really say "clean"<br>
> before doing the rebase?<br>
<br>
</div>Well, of course. I'm not that inexperienced with git :)<br>
<br></blockquote><div><br>Not trying to offend you. Just making sure. I can't tell how often I ended up with problems like this and forgot to check the most obvious things. :-)<br><br>Well, it does sound like some form of corruption. Doing a new clone might be the easiest way to fix it, even though there probably is some other solution to it (for example, removing the file and then doing a hard reset, etc.).<br>
</div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<br>
PS: Please don't top-post.<br>
<div><div></div><br></div></blockquote></div><br>Yeah. Sorry. Forgot you guys don't like that. Different people, different style rules. :-P<br clear="all"><br>-- <br>Magnus Bergmark - magnus DOT bergmark AT gmail DOT com<br>
GPG/PGP: 0x7BE84794DB6AA648<br>Fingerprint: 0E6F D2DB F0EF 534A 2184 52AF 7BE8 4794 DB6A A648<br>