git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sverre Rabbelier <srabbelier@gmail.com>
To: "lists@mgreg.com" <lists@mgreg.com>
Cc: Daniel Barkalow <barkalow@iabervon.org>, git@vger.kernel.org
Subject: Re: Merging to and from non-current branches.
Date: Tue, 4 Aug 2009 20:46:04 -0700	[thread overview]
Message-ID: <fabb9a1e0908042046w174d2591n2d9502d81a795d3a@mail.gmail.com> (raw)
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

  parent reply	other threads:[~2009-08-05  3:46 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-04 23:21 Merging to and from non-current branches lists
2009-08-05  2:45 ` Daniel Barkalow
2009-08-05  2:48   ` lists
2009-08-05  3:33     ` Adam Brewster
2009-08-05  3:46     ` Sverre Rabbelier [this message]
2009-08-05 21:28     ` Alex Riesen
2009-08-06  1:48       ` lists
2009-08-06  2:15         ` Randal L. Schwartz
2009-08-06 17:41         ` Daniel Barkalow
2009-08-06 18:43           ` Junio C Hamano
2009-08-06 11:54     ` Steffen Siebert

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=fabb9a1e0908042046w174d2591n2d9502d81a795d3a@mail.gmail.com \
    --to=srabbelier@gmail.com \
    --cc=barkalow@iabervon.org \
    --cc=git@vger.kernel.org \
    --cc=lists@mgreg.com \
    /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).