From: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
To: Martin Fick <mfick@codeaurora.org>
Cc: "SZEDER Gábor" <szeder@ira.uka.de>,
"Daly Gutierrez" <daly.gutierrez@gmail.com>,
git@vger.kernel.org
Subject: Re: Recovering Committed Changes in a Detached Head?
Date: Sun, 9 Oct 2011 16:52:11 +1100 [thread overview]
Message-ID: <CACsJy8CsMCju7joj2B2xbBSTF1vHjyuFeSZyPhTJisO2sU-Fqg@mail.gmail.com> (raw)
In-Reply-To: <ab706826-75df-4410-941e-6b40ec92713c@email.android.com>
On Sun, Oct 9, 2011 at 9:00 AM, Martin Fick <mfick@codeaurora.org> wrote:
>>git reflog to the rescue. For your example above it will output
>>something like this:
>>
>>deadbeef HEAD@{0}: checkout: moving from
>>92aa5381b9f7229523dba42aa94735c30f173451 to New_Branch
>> 92aa5381 HEAD@{1}: commit: Committing this in the Detached Head
>>3a5bb38a HEAD@{2}: checkout: moving from master to
>>3a5bb38a83c00f7acab573f0ec836577143200aa
>> deafbabe HEAD@{3}: ...
>> ...
>>
>>There you see the first line of the commit message from your "lost"
>>commit, and you can do
>>
>> git checkout -b lost_detached_head 92aa5381
>>
>>and you get a branch pointing to that commit you made while on
>>detached head, and you can work with it as usual.
>
> While rflog is cool, I can't help but think that git could be even more helpful for these scenarios.
>
> First, maybe git could create refs for these automatically, perhaps with a name like orphans/1? Maybe these refs would only be visible via git branch --orphans.
If I remember correctly, we don't have private ref namespace, any refs
created automatically this way could be pushed out by accident.
--
Duy
next prev parent reply other threads:[~2011-10-09 5:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-08 20:58 Recovering Committed Changes in a Detached Head? Daly Gutierrez
2011-10-08 21:37 ` SZEDER Gábor
2011-10-08 22:00 ` Martin Fick
2011-10-09 3:32 ` Joel C. Salomon
2011-10-09 5:39 ` Martin Fick
2011-10-09 5:52 ` Nguyen Thai Ngoc Duy [this message]
2011-10-09 7:46 ` Ronan Keryell
2011-10-09 8:12 ` Matthieu Moy
2011-10-09 23:22 ` Junio C Hamano
2011-10-10 1:26 ` Miles Bader
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=CACsJy8CsMCju7joj2B2xbBSTF1vHjyuFeSZyPhTJisO2sU-Fqg@mail.gmail.com \
--to=pclouds@gmail.com \
--cc=daly.gutierrez@gmail.com \
--cc=git@vger.kernel.org \
--cc=mfick@codeaurora.org \
--cc=szeder@ira.uka.de \
/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).