On Sat, Jul 13, 2013 at 4:07 PM, Thomas Ferris Nicolaisen
<tfn...@gmail.com> wrote:
>
>> I hope I can recover these changes from backups - if not I've lost
>> quite a bit of work.
>
>
> First of all, no matter how much you rebase around, Git will not throw away
> old history in a repository.

No doubt that is true, but I just didn't have the time to mess around
with this. This is a very active project for a client and I had to
forge ahead. I was able to get most of my changes from backup and I
only lost work from that morning, which I was easily able to recreate.

> Have a good look through the reflog to find
> your last known stable point, and then do a git reset --hard to this point.
> Read this: http://effectif.com/git/recovering-lost-git-commits

Thanks. This looks useful - I'll save it for future reference (which I
hope I'll never need ;-)


> Now, going back to the original idea, using git rebase --interactive, you
> better read up on how it works a bit before you try again.
> https://help.github.com/articles/interactive-rebase

Wish I had read that before. I did read the man page, but it wasn't
all that helpful

Thanks!
-larry

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.


Reply via email to