From: Stephen Haberman <stephen@exigencecorp.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, avarab@gmail.com
Subject: Re: [PATCH] pull: Allow pull to preserve merges when rebasing.
Date: Fri, 9 Aug 2013 10:28:27 -0500 [thread overview]
Message-ID: <20130809102827.3c5d09fa@sh9> (raw)
In-Reply-To: <alpine.DEB.1.00.1308091618530.24252@s15462909.onlinehome-server.info>
> We have a patch in Git for Windows allowing rebase = interactive
> which I did not have time to send upstream.
Cool, so, would rebase=preserve and rebase=interactive be completely
orthogonal?
E.g. do we have to worry about the user wanting to do both, like with
something ugly like rebase=preserve-interactive?
Assuming not, rebase=preserve sounds good to me. I have a patch
that does that about ready to submit.
- Stephen
next prev parent reply other threads:[~2013-08-09 15:28 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
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 [this message]
-- 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=20130809102827.3c5d09fa@sh9 \
--to=stephen@exigencecorp.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).