From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id D60AB1F5AE for ; Thu, 22 Jul 2021 00:21:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229783AbhGUXlV (ORCPT ); Wed, 21 Jul 2021 19:41:21 -0400 Received: from pb-smtp20.pobox.com ([173.228.157.52]:58423 "EHLO pb-smtp20.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229600AbhGUXlU (ORCPT ); Wed, 21 Jul 2021 19:41:20 -0400 Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 161AC146106; Wed, 21 Jul 2021 20:21:56 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=QLf9XM3POllDVGKYXqA6LViWgI+/VvcTrxyoE8 ANgvc=; b=c1tPWaK1OgPHzHwPsVqP1dX5gu0gKMUM61dFxJlOflrs5PIRCBE0Cb v/V8vb9MYywgN46q8wswAGW3N7VrirPyeH3VZlcHbidWEav4dFENhh1K4i/QeKnN vA5h6yufzLJuVPqPQEqXB+ye+jfAnkJH5jnayEQdDHuoKg/bxRy+8= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 0EB6F146104; Wed, 21 Jul 2021 20:21:56 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.74.3.135]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id 54D8C146103; Wed, 21 Jul 2021 20:21:53 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: Felipe Contreras Cc: git@vger.kernel.org, Alex Henrie , Marc Branchaud , Philip Oakley , Elijah Newren , Stephen Haberman Subject: Re: [PATCH] doc: pull: fix rebase=false documentation References: <20210721221545.1878514-1-felipe.contreras@gmail.com> Date: Wed, 21 Jul 2021 17:21:51 -0700 In-Reply-To: (Junio C. Hamano's message of "Wed, 21 Jul 2021 16:33:27 -0700") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: D0BCC2E6-EA82-11EB-8328-D5C30F5B5667-77302942!pb-smtp20.pobox.com Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Junio C Hamano writes: > Felipe Contreras 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/