On Fri, 2 Oct 2009 23:46:53 +0200
Alex Riesen <raa.lkml@xxxxxxxxx> wrote:
> On Fri, Oct 2, 2009 at 22:08, Tim <timothyjwashington@xxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html