Re: "Not currently on any branch"
- From
Sean Estabrooks <seanlkml@sympatico.ca>
- Date
- Oct 2, 2009, 23:15 UTC
- Message-ID
- <BLU0-SMTP927FF0174DF8AAD58644A8AED20@phx.gbl>
- In-Reply-To
- <81b0412b0910021446nb07e7e9l465f588168297fe9@mail.gmail.com>
On Fri, 2 Oct 2009 23:46:53 +0200 Alex Riesen <raa.lkml@gmail.com> wrote:
Show 10 quoted lines
> 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 > >
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