From: Steven Noonan <steven@uplinklabs.net>
To: Tim <timothyjwashington@yahoo.ca>
Cc: git@vger.kernel.org
Subject: Re: "Not currently on any branch"
Date: Fri, 2 Oct 2009 13:58:42 -0700 [thread overview]
Message-ID: <f488382f0910021358nc4a8c2ehca665c47aa39224c@mail.gmail.com> (raw)
In-Reply-To: <loom.20091002T215942-663@post.gmane.org>
On Fri, Oct 2, 2009 at 1:08 PM, Tim <timothyjwashington@yahoo.ca> 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
next prev parent reply other threads:[~2009-10-02 21:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-02 20:08 "Not currently on any branch" Tim
2009-10-02 20:58 ` Steven Noonan [this message]
2009-10-02 21:46 ` Alex Riesen
2009-10-02 23:15 ` Sean Estabrooks
2009-10-04 7:22 ` Clemens Buchacher
-- strict thread matches above, loose matches on Subject: below --
2009-10-05 4:01 Timothy Washington
2009-10-05 4:19 ` Junio C Hamano
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=f488382f0910021358nc4a8c2ehca665c47aa39224c@mail.gmail.com \
--to=steven@uplinklabs.net \
--cc=git@vger.kernel.org \
--cc=timothyjwashington@yahoo.ca \
/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).