git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Sixt <j.sixt@viscovery.net>
To: Jacopo Pecci <jacopo.pecci@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Master branch not updating
Date: Mon, 22 Mar 2010 18:17:52 +0100	[thread overview]
Message-ID: <4BA7A640.1080207@viscovery.net> (raw)
In-Reply-To: <295c22191003220943o2ef330ddk58a8180411ddbb2b@mail.gmail.com>

Am 3/22/2010 17:43, schrieb Jacopo Pecci:
> Then I have tried “checkout master branch”, suddenly all the commits
> in between the one labelled [master] and the latest one vanished. I
> have not been able to get back.
> 
> I am terribly afraid I have lost 4 day work. Do you have any
> suggestion? How is it possible that something which I have committed
> is not retrievable anymore.

1. Don't panic.

2. Make a backup copy, *including* the .git directory (very important!)

The .git directory contains your 4 day work, and it is very likely still
retrievable.

It may be a simple matter of

   git branch the-lost-state HEAD@{1}

If you can't work on a command line, then git extensions certainly has
some nice UI that lets you create a branch at a particular revision. In
this case, the branch name is "the-lost-state", and the revision is HEAD@{1}.

You can try more branch names at HEAD@{2}, HEAD@{3} (you get the point).
It means, roughly, "the state where HEAD was 1, 2, 3, etc. git operations
ago".

-- Hannes

  parent reply	other threads:[~2010-03-22 17:18 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-22 16:43 Master branch not updating Jacopo Pecci
2010-03-22 16:47 ` Thomas Rast
2010-03-22 17:17 ` Johannes Sixt [this message]
2010-03-23  7:34   ` Jacopo Pecci

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4BA7A640.1080207@viscovery.net \
    --to=j.sixt@viscovery.net \
    --cc=git@vger.kernel.org \
    --cc=jacopo.pecci@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).