From: Alex Riesen <raa.lkml@gmail.com>
To: Tim <timothyjwashington@yahoo.ca>
Cc: git@vger.kernel.org
Subject: Re: "Not currently on any branch"
Date: Fri, 2 Oct 2009 23:46:53 +0200 [thread overview]
Message-ID: <81b0412b0910021446nb07e7e9l465f588168297fe9@mail.gmail.com> (raw)
In-Reply-To: <loom.20091002T215942-663@post.gmane.org>
On Fri, Oct 2, 2009 at 22:08, Tim <timothyjwashington@yahoo.ca> wrote:
> 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
next prev parent reply other threads:[~2009-10-02 21:47 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
2009-10-02 21:46 ` Alex Riesen [this message]
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=81b0412b0910021446nb07e7e9l465f588168297fe9@mail.gmail.com \
--to=raa.lkml@gmail.com \
--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).