From: Junio C Hamano <gitster@pobox.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, Alex Henrie <alexhenrie24@gmail.com>,
Marc Branchaud <marcnarc@xiplink.com>,
Philip Oakley <philipoakley@iee.email>,
Elijah Newren <newren@gmail.com>,
Stephen Haberman <stephen@exigencecorp.com>
Subject: Re: [PATCH] doc: pull: fix rebase=false documentation
Date: Wed, 21 Jul 2021 17:21:51 -0700 [thread overview]
Message-ID: <xmqqtukn9p0g.fsf@gitster.g> (raw)
In-Reply-To: <xmqqy29z9r94.fsf@gitster.g> (Junio C. Hamano's message of "Wed, 21 Jul 2021 16:33:27 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Felipe Contreras <felipe.contreras@gmail.com> writes:
>
>> diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
>> index 5c3fb67c01..7f4b2d1982 100644
>> --- a/Documentation/git-pull.txt
>> +++ b/Documentation/git-pull.txt
>> @@ -117,7 +117,7 @@ When set to `preserve` (deprecated in favor of `merges`), rebase with the
>> `--preserve-merges` option passed to `git rebase` so that locally created
>> merge commits will not be flattened.
>> +
>> -When false, merge the current branch into the upstream branch.
>> +When false, merge the upstream branch into the current branch.
>> +
>> When `interactive`, enable the interactive mode of rebase.
>> +
>
> Looks correct. Will queue. Thanks.
By the way, I'll update the proposed log message to say only that
the documentation needs to be fixed as it does not say what the
command does. We should be able to fix the inaccuracies in the
documentation quickly without advocating different behaviour or
trashing the current behaviour in the proposed log message.
I also happen to think that "flipping the merge order" is not a good
thing to do anyway [*1*]; keeping the log message to state just "the
description does not reflect reality-fix it" has the added benefit
that we do not have to debate it.
[Footnote]
*1* https://public-inbox.org/git/7vd2shheic.fsf@alter.siamese.dyndns.org/
next prev parent reply other threads:[~2021-07-22 0:21 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-21 22:15 [PATCH] doc: pull: fix rebase=false documentation Felipe Contreras
2021-07-21 23:33 ` Junio C Hamano
2021-07-22 0:21 ` Junio C Hamano [this message]
2021-07-22 1:24 ` Felipe Contreras
2021-07-23 7:30 ` Jeff King
2021-07-23 10:05 ` Philip Oakley
2021-07-23 16:54 ` Felipe Contreras
2021-07-23 15:58 ` Junio C Hamano
2021-07-23 18:29 ` Felipe Contreras
2021-07-23 21:44 ` Junio C Hamano
2021-07-24 3:56 ` Felipe Contreras
2021-07-23 16:36 ` Felipe Contreras
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=xmqqtukn9p0g.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=alexhenrie24@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=marcnarc@xiplink.com \
--cc=newren@gmail.com \
--cc=philipoakley@iee.email \
--cc=stephen@exigencecorp.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).