Re: [PATCH] doc: pull: fix rebase=false documentation

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 22, 2021, 00:21 UTC
Message-ID: <xmqqtukn9p0g.fsf@gitster.g>
In-Reply-To: <xmqqy29z9r94.fsf@gitster.g>

Junio C Hamano <gitster@pobox.com> writes:

Show 17 quoted lines

> 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/