git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Haberman <stephen@exigencecorp.com>
To: git@vger.kernel.org
Cc: Johannes.Schindelin@gmx.de, avarab@gmail.com
Subject: Re: [PATCH] pull: Allow pull to preserve merges when rebasing.
Date: Thu, 8 Aug 2013 14:08:39 -0500	[thread overview]
Message-ID: <20130808140839.56c8343f@sh9> (raw)
In-Reply-To: <1375983492-32282-2-git-send-email-stephen@exigencecorp.com>


> This is because "git pull" currently does not know about rebase's
> preserve merges flag, which would this behavior, and instead replay
> on the merge commit of the feature branch onto the new master, and
> not the entire feature branch itself.

Ack, sorry, I was doing this too late last night--should say:

This is because "git pull" currently does not know about rebase's
preserve merges flag, which would avoid this behavior by replaying the
merge commit of the feature branch onto the new master, and not
replaying each individual commit in the feature branch.

- Stephen

  reply	other threads:[~2013-08-08 19:08 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-08 17:38 [RFC] allow git pull to preserve merges Stephen Haberman
2013-08-08 17:38 ` [PATCH] pull: Allow pull to preserve merges when rebasing Stephen Haberman
2013-08-08 19:08   ` Stephen Haberman [this message]
2013-08-08 21:20   ` Johannes Schindelin
2013-08-08 21:35     ` Stephen Haberman
2013-08-08 21:56       ` Philip Oakley
2013-08-08 21:57       ` Junio C Hamano
2013-08-09 14:19         ` Johannes Schindelin
2013-08-09 15:28           ` Stephen Haberman
  -- strict thread matches above, loose matches on Subject: below --
2013-08-10  4:58 Stephen Haberman
2013-08-11  6:16 ` Eric Sunshine
2013-08-11  7:12   ` Eric Sunshine
2013-08-11 21:26 Stephen Haberman
2013-08-11 23:03 ` Andres Perera
2013-08-11 23:09   ` Stephen Haberman
2013-08-11 23:31     ` Andres Perera
2013-08-11 23:38       ` Stephen Haberman
2013-08-12  5:40       ` Junio C Hamano
2013-08-12  7:00         ` Junio C Hamano
2013-08-12 17:04           ` Stephen Haberman
2013-08-12  6:21 Stephen Haberman
2013-08-12  6:46 ` Junio C Hamano
2013-08-12 16:28   ` Stephen Haberman
2013-08-13  3:43 Stephen Haberman

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=20130808140839.56c8343f@sh9 \
    --to=stephen@exigencecorp.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=avarab@gmail.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;
as well as URLs for NNTP newsgroup(s).