git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Merging to and from non-current branches.

From
Sverre Rabbelier <srabbelier@gmail.com>
Date
Aug 5, 2009, 03:46 UTC
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:
Show 8 quoted lines
> 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
Previous: Adam BrewsterNext: Alex Riesen
Message 5 of 11 in “Merging to and from non-current branches.”
  1. lists@mgreg.comAug 4, 2009
  2. Daniel BarkalowAug 5, 2009
  3. lists@mgreg.comAug 5, 2009
  4. Adam BrewsterAug 5, 2009
  5. Sverre RabbelierAug 5, 2009
  6. Alex RiesenAug 5, 2009
  7. lists@mgreg.comAug 6, 2009
  8. Randal L. SchwartzAug 6, 2009
  9. Daniel BarkalowAug 6, 2009
  10. Junio C HamanoAug 6, 2009
  11. Steffen SiebertAug 6, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.