Git: "Not currently on any branch." Is there an easy way to get back on a branch, while keeping the changes?

git branch git-checkout
Erik B picture Erik B · Jan 19, 2011 · Viewed 184.9k times · Source

So I've done some work in the repository and when I'm about to commit I realize that I'm not currently on any branch.

This happens a lot when working with submodules and I am able to solve it, but the process is tedious and I've been thinking that there must be an easier way to do this.

Is there an easy way to get back on a branch, while keeping the changes?

Answer

araqnid picture araqnid · Jan 19, 2011

If you have not committed:

git stash
git checkout some-branch
git stash pop

If you have committed and have not changed anything since:

git log --oneline -n1 # this will give you the SHA
git checkout some-branch
git merge ${commit-sha}

If you have committed and then done extra work:

git stash
git log --oneline -n1 # this will give you the SHA
git checkout some-branch
git merge ${commit-sha}
git stash pop

Related questions

git: Switch branch and ignore any changes without committing

I was working on a git branch and was ready to commit my changes, so I made a commit with a useful commit message. I then absentmindedly made minor changes to the code that are not worth keeping. I now …

Read More
Difference between git checkout --track origin/branch and git checkout -b branch origin/branch

Does anybody know the difference between these two commands to switch and track a remote branch? git checkout -b branch origin/branch git checkout --track origin/branch I think both keep track of the remote branch so I can push …

Read More
Git checkout another branch

I run: git checkout mygithub/master but for some reason, running 'git status' shows "not currently on any branch". Running: git checkout master and then git status, says that I'm now on branch master. Now I want to switch to …

Read More