From: Sverre Rabbelier <srabbelier@gmail.com>
Date: Wed, 05 Aug 2009 03:46:04 GMT
Subject: Re: Merging to and from non-current branches.
Message-ID: <fabb9a1e0908042046w174d2591n2d9502d81a795d3a@mail.gmail.com>
In-Reply-To: <518952FC-626C-43FB-BD53-98DE849C9751@mgreg.com>

Heya,

On Tue, Aug 4, 2009 at 19:48, lists@mgreg.com<lists@mgreg.com> wrote:
> I appreciate your post.  I understand what you're saying, and I'm not so
> much concerned about the logistics of what need to occur so much as a single
> command to intuitively handle it.  I've been doing a great deal of
> incremental development lately and it becomes rather tedious to have to
> checkout master, merge dev, re-checkout dev and proceed.  I'm not sure why
> this isn't currently possible with a single command.  I suppose I could
> write a shell script to do so, but that's a little less "native" than I'd
> like.

You might want to try out an alias:

$ git config alias.update "!git checkout master && git merge dev &&
git checkout dev"

-- 
Cheers,

Sverre Rabbelier