From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, Paul Tan <pyokagan@gmail.com>
Subject: Re: [PATCH 2/3] Teach 'git remote' that the config var branch.*.rebase can be 'interactive'
Date: Wed, 13 Jan 2016 14:26:26 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.20.1601131422260.2964@virtualbox> (raw)
In-Reply-To: <vpqziw9oefy.fsf@anie.imag.fr>
Hi Matthieu,
On Wed, 13 Jan 2016, Matthieu Moy wrote:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > On Wed, 13 Jan 2016, Matthieu Moy wrote:
> >
> >> Johannes Schindelin <johannes.schindelin@gmx.de> writes:
> >>
> >> What happens if one has branch.*.rebase=interactive, and wants to
> >> make an exception? Does
> >>
> >> git pull --rebase=true
> >>
> >> cancel the 'interactive' part?
> >
> > It is the same situation as before (just substitute a
> > branch.*.rebase=preserve setting): yes, the config is parsed first,
> > then the command line, so the command line wins.
> >
> >> I guess it is, but if so I think it should be tested and documented.
> >
> > Is this really necessary, given that the behavior has not changed from
> > before?
>
> Well, before your patch, branch.*.rebase=interactive was not possible.
But branch.*.rebase=preserve was. And it is still different from
branch.*.rebase=true. And as per v2.7.0, those config settings can be
overridden via the command line.
Seeing as I did not change that behavior, I would find it a bit odd to
document that the command line can override the config setting.
> It is not immediately clear to me that --rebase=true can mean "do the
> pull with rebasing, but without going interactive", as "do pull with
> rebase" and "rebase interactively" could be two independant things.
> Reading the current doc does not help much: "When true, rebase the
> current branch on top of the upstream branch after fetching" => it does
> not say that "true" also specifies which kind of rebase is performed.
Again, I did not change that behavior, and the same confusion could arise
with the "preserve" setting.
But I do not really see the confusion, as `git rebase` (without -p and
without -i) means: "perform a rebase", and everybody assumes that it is a
non-interactive, non-merge-preserving rebase. Hence I would assume that
users know that a rebase without any further adjective refers to the
plain, non-interactive, non-merge-preserving one.
Ciao,
Dscho
next prev parent reply other threads:[~2016-01-13 13:27 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 [this message]
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
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.1601131422260.2964@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=Matthieu.Moy@grenoble-inp.fr \
--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).