Re: Merging to and from non-current branches.

From: Steffen Siebert <git@steffensiebert.de>
Date: Aug 6, 2009, 11:54 UTC
Message-ID: <loom.20090806T115042-526@post.gmane.org>
In-Reply-To: <518952FC-626C-43FB-BD53-98DE849C9751@mgreg.com>

lists <at> mgreg.com <lists <at> mgreg.com> writes:

Show 6 quoted lines

> 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.

Hi Michael,

I had a similar problem (we are doing rebases instead of merges) and found a way to rebase and push my changes onto the master without the need of a "checkout master".

You can find my question and the approved (green) answer that works for me on stackoverflow.com:

http://stackoverflow.com/questions/945372/how-to-efficiently-rebase-and-push-a-local-git-branch

Maybe this works for you, too.

Ciao,
  Steffen