From: Erik Faye-Lund <kusmabite@googlemail.com>
Date: Thu, 29 Apr 2010 01:29:25 GMT
Subject: Re: How to undo changes?
Message-ID: <g2z40aa078e1004281829o446bce44r165aa59c98969043@mail.gmail.com>
In-Reply-To: <l2l10d816431004281808s79a559e6p308052c788c9a4ca@mail.gmail.com>

On Thu, Apr 29, 2010 at 3:08 AM, Lin Mac <mkl0301@gmail.com> wrote:
> Hi,
>
> 1.
> I have multiple files modified, but would like to undo the changes in
> one of the changed files.
> "git reset --hard" do not accept single files. So I used to use "git
> diff <file> | patch -p X", but X cannot be know until I checked the
> patch and know the path relationship. Is there other way to do it?

git checkout -- <file>

>
> 2.
> Sometimes I delete old unused branches with "git branch -D <branch>",
> but I just realized theren't a reflog log for such operation. If the
> branch is the only reference to the logs, deleting the branch makes
> the commits become dangling commits.  How could I recover those
> commit?
>

Run "git fsck --lost-found" to list the SHA-1s of all dangling objects.

But make sure you've taken a backup of the repo first, just in case
something gets messed up further ;)

-- 
Erik "kusma" Faye-Lund