git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	git@vger.kernel.org, "Phillip Wood" <phillip.wood@dunelm.org.uk>,
	gitgitgadget@gmail.com, "Pratik Karki" <predatoramigo@gmail.com>,
	"Jeff King" <peff@peff.net>
Subject: Re: [PATCH v2 1/2] rebase doc: document rebase.useBuiltin
Date: Fri, 16 Nov 2018 18:58:08 +0900	[thread overview]
Message-ID: <xmqq1s7ljqdr.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1811161007030.41@tvgsbejvaqbjf.bet> (Johannes Schindelin's message of "Fri, 16 Nov 2018 10:35:39 +0100 (STD)")

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Meaning: essentially, `rebase.useBuiltin` was defaulting to `false`, and
> if a user installed Git for Windows with the experimental built-in rebase,
> it was set to `true` in the system config.

Oh, that changes the picture entirely.  If that was what was shipped
to Windows users for 2.19.X, then I'd say we should be able to trust
the switch well enough.  I just somehow thought that everybody in
the Windows land has been using the -in-C version.

>> Having said that, assuming that the switching back to scripted
>> version works correctly and assuming that we want to expose this to
>> end users, I think the patch text makes sense.
>
> Indeed.
>
> I would still love to see the built-in rebase to be used by default in
> v2.20.0, and I am reasonably sure that the escape hatch works (because, as
> I told you above, it worked in the reverse, making the built-in rebase an
> opt-in in Git for Windows v2.19.1).

Good.  That makes things a lot simpler.

Thanks.

  reply	other threads:[~2018-11-16  9:58 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <0181114090144.31412-1-avarab@gmail.com>
2018-11-14  9:15 ` [PATCH v2 0/2] rebase.useBuiltin doc & test mode Ævar Arnfjörð Bjarmason
2018-11-14  9:15 ` [PATCH v2 1/2] rebase doc: document rebase.useBuiltin Ævar Arnfjörð Bjarmason
2018-11-14 13:52   ` Johannes Schindelin
2018-11-16  3:40   ` Junio C Hamano
2018-11-16  9:35     ` Johannes Schindelin
2018-11-16  9:58       ` Junio C Hamano [this message]
2018-11-14  9:15 ` [PATCH v2 2/2] tests: add a special setup where rebase.useBuiltin is off Ævar Arnfjörð Bjarmason
2018-11-14 13:53   ` Johannes Schindelin
2018-11-14 13:58     ` Ævar Arnfjörð Bjarmason

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqq1s7ljqdr.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=peff@peff.net \
    --cc=phillip.wood@dunelm.org.uk \
    --cc=predatoramigo@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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).