Git development
 help / color / mirror / Atom feed
From: Stephen Haberman <stephen@exigencecorp.com>
To: git@vger.kernel.org
Subject: pull --preserve-merges
Date: Fri, 7 Nov 2008 16:01:38 -0600	[thread overview]
Message-ID: <20081107160138.aa96405c.stephen@exigencecorp.com> (raw)

Hi,

Awhile ago I brought up wanting to have a "rebase with preserve merges"
option for `git pull`:

http://thread.gmane.org/gmane.comp.version-control.git/96513

Andreas had a patch to help by supporting manually typing out `git pull
--rebase --preserve-merges`:

http://thread.gmane.org/gmane.comp.version-control.git/96593

And then I did another small copy/paste patch on top to add a config
setting of `branch.<name>.preservemerges` much like the existing
`branch.<name>.rebase`.

The patches haven't gotten an explicit "no" that I noticed, nor have
they been applied...is there anything I can do to move them along?
Resubmit them or what not?

Thanks,
Stephen

             reply	other threads:[~2008-11-07 22:02 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-07 22:01 Stephen Haberman [this message]
2008-11-08 15:08 ` pull --preserve-merges Johannes Schindelin
2008-11-08 17:07   ` Francis Galiegue
2008-11-08 17:57     ` Stephen Haberman
2008-11-10 19:05 ` Stephen Haberman
2008-11-10 19:48   ` Johannes Schindelin

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=20081107160138.aa96405c.stephen@exigencecorp.com \
    --to=stephen@exigencecorp.com \
    --cc=git@vger.kernel.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