git - How to move HEAD back to a previous location? (Detached head) -


in git, trying squash commit merging in branch , resetting head previous place via:

git reset origin/master

but need step out of this. how can move head previous location?

i have sha1 frag (23b6772) of commit need move to.
how can commit?

before answering lets add background, explaining head.

first of head?

head reference current commit (latest) on current branch.
there can single head @ given time. (excluding git worktree)

the content of head stored inside .git/head , contains 40 bytes sha-1 of current commit.

detached head

if not on latest commit - meaning head pointing prior commit in history called detached head.

enter image description here

on command line this- sha-1 instead of branch name since head not pointing the tip of current branch

enter image description here

a few options on how recover detached head:

git checkout

git checkout <commit_id> git checkout -b <new branch> <commit_id> git checkout head~x // x number of commits t go

this checkout new branch pointing desired commit.
command checkout given commit.
@ point can create branch , start work point on.

# checkout given commit.  # doing result in `detached head` mean `head` # not pointing latest need checkout branch # in order able update code. git checkout <commit-id>  # create new branch forked given commit git checkout -b <branch name>

git reflog

you can use reflog well.
git reflog display change updated head , checking out desired reflog entry set head commit.

every time head modified there new entry in reflog

git reflog git checkout head@{...}

this desired commit

enter image description here

git reset head --hard <commit_id>

"move" head desired commit.

# destroy local modifications. # don't if have uncommitted work want keep. git reset --hard 0d1d7fc32  # alternatively, if there's work keep: git stash git reset --hard 0d1d7fc32 git stash pop # saves modifications, reapplies patch after resetting. # merge conflicts, if you've modified things # changed since commit reset to.

git revert <sha-1>

"undo" given commit or commit range.
reset command "undo" changes made in given commit.
new commit undo patch commited while original commit remain in history well.

# add new commit undo of original one. # <sha-1> can commit(s) or commit range git revert <sha-1>

this schema illustrate command what.
can see there reset && checkout modify head.

enter image description here


Comments

Post a Comment

Popular posts from this blog

'hasOwnProperty' in javascript -

i use obj.hasownproperty judge whether object has property, when replaced obj[prop] !== undefined , not normal implementation, ask, why behind method can not use it? object.hasownproperty(prop); object[prop] !== undefined; obj[prop] !== undefined wrong 2 reasons: you can explicitly set property undefined , obj[prop] = undefined; . obj.hasownproperty(prop) return true in case. obj[prop] follow prototype chain, return property that's inherited. obj.hasownproperty(prop) returns true if property exists directly in object, returns false inherited properties.
Read more

How to understand 2 main() functions after using uftrace to profile the C++ program? -

i trying uftrace profile following simple c++ program: #include <iostream> class { public: a() {std::cout << "a created" << std::endl;} ~a() {std::cout << "a destroyed" << std::endl;} }; int main() { a; return 0; } the profile result this: # uftrace a.out created destroyed # duration tid function 2.026 [ 4828] | __cxa_atexit(); [ 4828] | main() { [ 4828] | __static_initialization_and_destruction_0() { 89.397 [ 4828] | std::ios_base::init::init(); 0.768 [ 4828] | __cxa_atexit(); 93.029 [ 4828] | } /* __static_initialization_and_destruction_0 */ 94.425 [ 4828] | } /* main */ [ 4828] | main() { [ 4828] | a::a() { 11.104 [ 4828] | std::operator <<(); 10.825 [ 4828] | std::basic_ostream::operator <<(); 24.514 [ 4828] | } /* a::a */ [ 4828] | a::~a() { 0.978 [ 4828] | ...
Read more

android - Unable to generate FCM token from dynamically instantiated Firebase -

our business logic requires instantiate firebase during runtime. fetch firebase credentials (app id, api key etc.) default firebase location after knowing user's public key , create firebase instance using credentials. this means there 2 firebase instances used within app: the default "index" firebase gives credentials second the actual firebase intend use point forward the second firebase initialised this: firebaseapp app = firebaseapp.initializeapp(<context>, <options>, <app_label>); our problem traditional method of retrieving fcm token using firebaseinstanceidservice , ontokenrefresh() fails since ontokenrefresh() method called first firebase instance. directly calling string token = firebaseinstanceid.getinstance(app).gettoken(); returns null never ready when called. have tried polling test if token generated @ point. no luck. how can generate fcm token reliably firebase instance instantiated during runtime? i...
Read more