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-Status: No, score=-3.6 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,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 11EC81F55B for ; Tue, 26 May 2020 19:20:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392044AbgEZTUe (ORCPT ); Tue, 26 May 2020 15:20:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391720AbgEZTUb (ORCPT ); Tue, 26 May 2020 15:20:31 -0400 Received: from mail-ua1-x942.google.com (mail-ua1-x942.google.com [IPv6:2607:f8b0:4864:20::942]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41883C03E96D for ; Tue, 26 May 2020 12:20:31 -0700 (PDT) Received: by mail-ua1-x942.google.com with SMTP id b13so7614786uav.3 for ; Tue, 26 May 2020 12:20:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=+svjRmYsPVUDNo4M6i2RaP0GNxaW1pqXhWeTLbQmeJg=; b=K1Ay0+kaeNe/8QEm3t9si2j5nTL113E9QOJxli2MIo5ap9vAf3D+hsivkXa7UciTVL CBvzy3OhGrejwHUSB3wUHE9MSx+lK4TVtNIyjPgtXenQjnns/VWyNW1i7EwcRJdcnGW/ ixYXeGUtJjofAteaIhc3wg6vexkKf/VKJimKj/IT+tOoQksg2voVeuusVb2oyck5V/8h jgz6PwNkAw7PZB1MWYqrBuVmMI2ltwdkje6LDI2CrADrBJ1MPxeF4pHqiXfAbZHLO3n2 51TxjEBClaaleny9sG9oMhr40UcV7an/IfXfhGNOyOt2w5+jplIGqDBe/RdPts+saQuY UZzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=+svjRmYsPVUDNo4M6i2RaP0GNxaW1pqXhWeTLbQmeJg=; b=SaEehTnJ5O8rtTByO0aLgC9t79tJi3KdTmGtdyC24MrTGsBdmslsejUiwD5h6yfZlG C/SjiHbuTDmFdBP0Ps6sN7npyIupfJa2mTbbE551XzzylOSFfTv61fMK1Af1XqZwcEBj fvEoXRC6CG+Po5YHoXld1zbw4AZ5brJjM5CYCHRjbbV8jHRL1Bi0ym+ud+qYAI3J86jS 03f3YAt8id3RRAA9auKMpRjURYJie1pZq47FnRDm3z39uvtqNqSbDJTB7CTesg5w5VJW Q0xDm61X8rOeJL/4IfDmJqz2p24AY02kxrTaj1xs4loFc8xwRFxIpzkeTTQ9S0mqfd8B saaQ== X-Gm-Message-State: AOAM532fkxU9SlsfWnDs6aaV3j0MYT/Xgnh2OtPFVh4yV3cCD5e495iO rhSo9Tf03eEnsIfRuLbr5RUXH/f2EDppBlKOuUlA4911 X-Google-Smtp-Source: ABdhPJx+KXXbFZJk5W3Mcr6dSjEaCb+Pm9bJryHU2+/mzx2BE5+RqhAY6gjXSX+w9dq/7b+GYZvLHfx4X/z2RM7AU28= X-Received: by 2002:ab0:1e4:: with SMTP id 91mr2121952ual.112.1590520830439; Tue, 26 May 2020 12:20:30 -0700 (PDT) MIME-Version: 1.0 References: <20200525170607.8000-1-martin.agren@gmail.com> <474bbf51-bd40-837a-77de-1688f6488ae3@gmail.com> In-Reply-To: <474bbf51-bd40-837a-77de-1688f6488ae3@gmail.com> From: =?UTF-8?Q?Martin_=C3=85gren?= Date: Tue, 26 May 2020 21:20:19 +0200 Message-ID: Subject: Re: [PATCH v2] rev-list-options.txt: start a list for `show-pulls` To: Derrick Stolee Cc: Junio C Hamano , Git Mailing List Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Tue, 26 May 2020 at 19:01, Derrick Stolee wrote: > > On 5/26/2020 11:16 AM, Junio C Hamano wrote: > > Martin =C3=85gren writes: > > > > This is not a new issue introduced by this patch, but ... > > > >> +--show-pulls:: > >> + In addition to the commits shown in the default history, show > >> + each merge commit that is not TREESAME to its first parent but > >> + is TREESAME to a later parent. > >> + > >> +When a merge commit is included by `--show-pulls`, the merge is > >> treated as if it "pulled" the change from another branch. When using > >> `--show-pulls` on this example (and no other options) the resulting > >> graph is: > > > > ... "is treated AS IF" somewhat made me go "huh?"; with or without > > the option, the merge did pull the change from another branch, > > didn't it? The only effect the option has is to make that fact > > stand out in the output. > > I guess the 'as if it "pulled" the change from another branch' sentence > is literally talking about the "git pull" command, as opposed to the > "git merge" command, or creating the merge upon completion of a pull requ= est > on a Git service (which is almost always using libgit2 to generate a merg= e > commit). > > Perhaps there is no semantic difference between "pulling" and "merging" > and then this could be reworded to be less awkward. Agreed on the awkwardness as it stands (before or after this proposed patch). I don't have any concrete thoughts to offer though. Martin