From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Paul Tan <pyokagan@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, Git List <git@vger.kernel.org>
Subject: Re: [PATCH v2 1/3] pull: allow interactive rebase with --rebase=interactive
Date: Wed, 13 Jan 2016 13:13:57 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.20.1601131313270.2964@virtualbox> (raw)
In-Reply-To: <CACRoPnS_CcAuu_jBo9zcjycSN4kvSQhCONNYnY1XRnarRF9Zmw@mail.gmail.com>
Hi Paul,
On Wed, 13 Jan 2016, Paul Tan wrote:
> On Wed, Jan 13, 2016 at 2:57 PM, Johannes Schindelin
> <johannes.schindelin@gmx.de> wrote:
> > diff --git a/Documentation/config.txt b/Documentation/config.txt
> > index 07f7a3b..e5897e9 100644
> > --- a/Documentation/config.txt
> > +++ b/Documentation/config.txt
> > @@ -865,6 +865,7 @@ branch.<name>.rebase::
> > instead of merging the default branch from the default remote when
> > "git pull" is run. See "pull.rebase" for doing this in a non
> > branch-specific manner.
> > + When the value is `interactive`, the rebase is run in interactive mode.
> > +
> > When preserve, also pass `--preserve-merges` along to 'git rebase'
> > so that locally committed merge commits will not be flattened
>
> I think this change needs to be repeated for the section on
> "pull.rebase" as well.
>
> > [...]
> > --
> > 2.6.3.windows.1.300.g1c25e49
>
> Other than that, builtin/pull.c has the following option definition
> that needs to be updated:
>
> { OPTION_CALLBACK, 'r', "rebase", &opt_rebase, "false|true|preserve",
> N_("incorporate changes by rebasing rather than merging"),
>
> The "false|true|preserve" needs to be updated to
> "false|true|preserve|interactive", I think.
Good points, both. Fixed in the upcoming v3.
Ciao,
Dscho
next prev parent reply other threads:[~2016-01-13 12:14 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-12 15:22 [PATCH 0/3] Support `git pull --rebase=interactive` Johannes Schindelin
2016-01-12 15:22 ` [PATCH 1/3] Teach 'git pull' to handle --rebase=interactive Johannes Schindelin
2016-01-12 23:40 ` Junio C Hamano
2016-01-13 6:52 ` Johannes Schindelin
2016-01-12 15:22 ` [PATCH 2/3] Teach 'git remote' that the config var branch.*.rebase can be 'interactive' Johannes Schindelin
2016-01-12 23:53 ` Junio C Hamano
2016-01-13 6:51 ` Johannes Schindelin
2016-01-13 9:42 ` Matthieu Moy
2016-01-13 12:03 ` Johannes Schindelin
2016-01-13 12:24 ` Matthieu Moy
2016-01-13 13:26 ` Johannes Schindelin
2016-01-12 15:22 ` [PATCH 3/3] completion: add missing branch.*.rebase values Johannes Schindelin
2016-01-12 23:54 ` Junio C Hamano
2016-01-13 6:57 ` [PATCH v2 0/3] Support `git pull --rebase=interactive` Johannes Schindelin
2016-01-13 6:57 ` [PATCH v2 1/3] pull: allow interactive rebase with --rebase=interactive Johannes Schindelin
2016-01-13 10:33 ` Paul Tan
2016-01-13 12:13 ` Johannes Schindelin [this message]
2016-01-13 17:36 ` Junio C Hamano
2016-01-13 18:50 ` Johannes Schindelin
2016-01-13 20:58 ` Junio C Hamano
2016-01-13 6:57 ` [PATCH v2 2/3] remote: handle the config setting branch.*.rebase=interactive Johannes Schindelin
2016-01-13 6:57 ` [PATCH v2 3/3] completion: add missing branch.*.rebase values Johannes Schindelin
2016-01-13 12:17 ` [PATCH v3 0/3] Support `git pull --rebase=interactive` Johannes Schindelin
2016-01-13 12:17 ` [PATCH v3 1/3] pull: allow interactive rebase with --rebase=interactive Johannes Schindelin
2016-01-13 12:17 ` [PATCH v3 2/3] remote: handle the config setting branch.*.rebase=interactive Johannes Schindelin
2016-01-13 12:17 ` [PATCH v3 3/3] completion: add missing branch.*.rebase values Johannes Schindelin
2016-01-13 21:20 ` [PATCH v3 0/3] Support `git pull --rebase=interactive` Junio C Hamano
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=alpine.DEB.2.20.1601131313270.2964@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pyokagan@gmail.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).