can git reset or checkout be reverted?

4 messages, 3 authors, 2016-06-15 · open the first message on its own page

can git reset or checkout be reverted?

From: bill lam <hidden>
Date: 2016-06-15 22:46:06

If I want to recall a old version of testing by

git reset --hard sha1
or
git checkout sha1

then git log does not show anything beyond that commit. It does give
some warning and recommend -b switch next time.  If I only do that by
accident or ignorance.  How to revert to the original HEAD?

-- 
regards,
====================================================
GPG key 1024D/4434BAB3 2008-08-24
gpg --keyserver subkeys.pgp.net --recv-keys 4434BAB3
唐詩274 韓翃  寒食
    春城無處不飛花  寒食東風御柳斜  日暮漢宮傳蠟燭  輕煙散入五侯家

Re: can git reset or checkout be reverted?

From: Jakub Narebski <hidden>
Date: 2016-06-15 22:46:06

bill lam [off-list ref] writes:
If I want to recall a old version of testing by

git reset --hard sha1
or
git checkout sha1

then git log does not show anything beyond that commit. It does give
some warning and recommend -b switch next time.  If I only do that by
accident or ignorance.  How to revert to the original HEAD?
  git checkout ORIG_HEAD

or

  git checkout HEAD@{1}

You can check it out wrt. second form using "git reflog" ("git log -g").

-- 
Jakub Narebski
Poland
ShadeHawk on #git

Re: can git reset or checkout be reverted?

From: Sitaram Chamarty <hidden>
Date: 2016-06-15 22:46:07

On 2009-02-06, bill lam [off-list ref] wrote:
If I want to recall a old version of testing by

git reset --hard sha1
or
git checkout sha1

then git log does not show anything beyond that commit. It does give
some warning and recommend -b switch next time.  If I only do that by
accident or ignorance.  How to revert to the original HEAD?
As others have said: reflog.

I just wanted to add, I've had a lot of luck using reflog's
@{now} feature:

    git reflog show @{now}

Coupled with a vague recollection of what action I did at
what time, this has saved me a few times, and if I've been
jumping around branches as well, then:

    git reflog show HEAD@{now}

Another good one is:

    git show-branch --sha1-name -g=5

(or some larger value depending on how big your xterm is.)
This is particularly useful when I've done a lot of 'git
commit --amend' or rebases; the top most '+' sign in each
column, starting from the left, is your reflog -- I don't
know who came up with this design but it's amazing how much
useful information is condensed into that display.

Re: can git reset or checkout be reverted?

From: bill lam <hidden>
Date: 2016-06-15 22:46:07

Sitaram Matthieu Jakub

Many thanks for help!

-- 
regards,
====================================================
GPG key 1024D/4434BAB3 2008-08-24
gpg --keyserver subkeys.pgp.net --recv-keys 4434BAB3
唐詩281 劉禹錫  春詞
    新妝宜面下朱樓  深鎖春光一院愁  行到中庭數花朵  蜻蜓飛上玉搔頭
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help