I have some code in a git repo that is "Not currently on any branch". Now,
there's the master branch and another branch 'ui-integration' that I'm using in
this project. I don't know how the project got into this headless state, but I
need to be using the 'ui-integration' branch.
I tried looking around the blogosphere for a solution, and tried what I found
here. But it seems like only my last commit (not the previous 10 I made) shows
up in the master branch (not ui-integration ).
http://blog.kortina.net/post/71935540/fix-git-not-currently-on-any-branch-problem
What's the most straightforward & cleanest way to merge my changes in the
headless branch to my 'ui-integration' branch?
Thanks in advance
Tim
From: Steven Noonan <hidden> Date: 2016-06-15 22:47:28
On Fri, Oct 2, 2009 at 1:08 PM, Tim [off-list ref] wrote:
I have some code in a git repo that is "Not currently on any branch". Now,
there's the master branch and another branch 'ui-integration' that I'm using in
this project. I don't know how the project got into this headless state, but I
need to be using the 'ui-integration' branch.
I tried looking around the blogosphere for a solution, and tried what I found
here. But it seems like only my last commit (not the previous 10 I made) shows
up in the master branch (not ui-integration ).
http://blog.kortina.net/post/71935540/fix-git-not-currently-on-any-branch-problem
What's the most straightforward & cleanest way to merge my changes in the
headless branch to my 'ui-integration' branch?
Try 'git checkout -b temp', which creates a branch called 'temp' with
its HEAD at where you currently are, and then merge your changes to
ui-integration via 'git checkout ui-integration; git merge temp', and
finally drop the junk branch with 'git branch -d temp'
- Steven
From: Sean Estabrooks <hidden> Date: 2016-06-15 22:47:28
On Fri, 2 Oct 2009 23:46:53 +0200
Alex Riesen [off-list ref] wrote:
On Fri, Oct 2, 2009 at 22:08, Tim [off-list ref] wrote:
quoted
What's the most straightforward & cleanest way to merge my changes in the
headless branch to my 'ui-integration' branch?
Assuming you use a Bourne shell:
$ prev=$(git rev-parse HEAD)
$ git checkout ui-integration && git merge $prev
You could also rely on the reflog to avoid the need to store off the
previous HEAD value, so just:
$ git checkout ui-integration && git merge HEAD@{1}
Sean
From: Clemens Buchacher <hidden> Date: 2016-08-13 23:24:51
On Fri, Oct 02, 2009 at 08:08:52PM +0000, Tim wrote:
I have some code in a git repo that is "Not currently on any branch". Now,
there's the master branch and another branch 'ui-integration' that I'm
using in this project. I don't know how the project got into this headless
state, but I need to be using the 'ui-integration' branch.
It can happen either by explicitly detaching HEAD using "git checkout
<commit>", or if you used rebase and it is still in progress.
Clemens