git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: Schuyler Duveen <sduveen@nypublicradio.org>,
	"git@vger.kernel.org" <git@vger.kernel.org>
Cc: "ram@rachum.com" <ram@rachum.com>
Subject: Re: git cascade and git forward-merge
Date: Tue, 29 Apr 2014 19:05:54 -0500	[thread overview]
Message-ID: <53603e62cd48a_3136105d3089d@nysa.notmuch> (raw)
In-Reply-To: <3C0A37210D5D044AB99EEAE13ADA186B08DAB8@NYPRMBX03.WNYC.ORG>

Schuyler Duveen wrote:
> This was a feature that I've really wanted for a while.  I took a bit
> of time to morph the most conservative version of forward-merge into
> pure-shell script:
> 
> https://github.com/schuyler1d/git-forward-merge/
> 
> Without strong objections, I'm going to try to make this into a patch for core.

I like this, but I think it should be an option to `git merge`.

-- 
Felipe Contreras

  reply	other threads:[~2014-04-30  0:16 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-29 23:01 git cascade and git forward-merge Schuyler Duveen
2014-04-30  0:05 ` Felipe Contreras [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-04-01 10:41 Ram Rachum

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=53603e62cd48a_3136105d3089d@nysa.notmuch \
    --to=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=ram@rachum.com \
    --cc=sduveen@nypublicradio.org \
    /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).