From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id sOazABqSmWS1jwAASxT56A (envelope-from ) for ; Mon, 26 Jun 2023 15:26:50 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id UNV6ABqSmWTUfgEAauVa8A (envelope-from ) for ; Mon, 26 Jun 2023 15:26:50 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D41683377 for ; Mon, 26 Jun 2023 15:26:49 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDmEn-0006Oi-Uv; Mon, 26 Jun 2023 09:26:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qDmEm-0006OZ-JV for guix-devel@gnu.org; Mon, 26 Jun 2023 09:26:36 -0400 Received: from mail-qv1-xf30.google.com ([2607:f8b0:4864:20::f30]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qDmEl-0008B2-7F for guix-devel@gnu.org; Mon, 26 Jun 2023 09:26:36 -0400 Received: by mail-qv1-xf30.google.com with SMTP id 6a1803df08f44-635decc135eso4237236d6.0 for ; Mon, 26 Jun 2023 06:26:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687785993; x=1690377993; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=ZcelCDVrnQfynTucleaU8oOY71imx+LBI0tU1ohG7NA=; b=oEPuThDCRkUrp4zNPTdKBImbMlykYsxqgE1ZFhEu3JT3n27t8ztX0vSqNtO8MOK7SE n0eTbohfRvQnkSpg2pyGBJZXG5iD9vaCGGComkbAOsHKKTUu8p3WDrPBvegoqdgifYyk D7bcWzfhiyo+1WPV8JL+LczbEkH0Kl9g8ka74WP/0488DCSEgpjr3eNVjTZjzGIKeXnu dlab/nlHvK6mrfboXno+OVbEb4M6YzynWhjIXGoeL0gCRNq+rc5jzMjnPUEPdVM51eue ijS+yFP0nkqPGx2h39YqkDEBt17pF2B8aHOa53WW7NTHBBkcOH4+O4/7epsoaNJacA8i FFJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687785993; x=1690377993; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ZcelCDVrnQfynTucleaU8oOY71imx+LBI0tU1ohG7NA=; b=F53KZv8GuC64yjFW6oj3z5LtBuZptjc+Y2j/4/s28cL4FF7WN3L/nTQm0+7bJJXLSp bvM+i70GYGtCkqdZl7iPCeIH9ViS4alo6trKBYtqP02OtZryS/8yAFa6ZDEfV1a7SUui r7uQ0+niNtW0m4JF+xsXtNFR09KpSZviZXcoF0Hj3BDuvZvzQAwpB/Lbo9Rn1fkAo115 EkBZ6qanczEbz0V+twrLx1tebx8IfZJTQH/KEv9LUwafq3vlLyvrWHBN9LEpigs5AD9G NFMqSD/9P+8Umz2WLkmkHytfwrGVIiETpqJMecgGXEpZ7YXqcdAgWX3FFlRzqSIWPWyF 2x6Q== X-Gm-Message-State: AC+VfDwxj5a0yydPLAEhj/Y6IItC4opJvd6o7q12m4THhzyuXLOpdFOn 6FuoX3wVX2EOJPgeDSyFFqqD5HInYjQ= X-Google-Smtp-Source: ACHHUZ5ar3FBq6fbBRVpL6UhymJwY9z0HryjZWN7d4vqUAL6zs61c0bSWFTT0i1vW0vlRc0SfYYaDg== X-Received: by 2002:a05:6214:2a8f:b0:630:14e0:982e with SMTP id jr15-20020a0562142a8f00b0063014e0982emr24937456qvb.22.1687785992340; Mon, 26 Jun 2023 06:26:32 -0700 (PDT) Received: from hurd (dsl-205-236-230-110.b2b2c.ca. [205.236.230.110]) by smtp.gmail.com with ESMTPSA id t11-20020a0cef4b000000b00626320deb0csm3099362qvs.101.2023.06.26.06.26.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 06:26:31 -0700 (PDT) From: Maxim Cournoyer To: Josselin Poiret Cc: Giovanni Biscuolo , Leo Famulari , Felix Lechner , Andreas Enge , Christopher Baines , guix-devel@gnu.org Subject: Re: Rebasing or merging? [was: Re: 01/03: gnu: wxwidgets: Add libxtst to inputs.] References: <168610879676.2825.9044237296073582277@vcs2.savannah.gnu.org> <20230607033317.826FCC23EDC@vcs2.savannah.gnu.org> <87sfb31qqp.fsf@cbaines.net> <87wn0aadrb.fsf@gmail.com> <87352xady4.fsf@gmail.com> <87y1kp8q11.fsf@gmail.com> <87cz1yx1z2.fsf@gmail.com> <87352m12dn.fsf@xelera.eu> <87v8fh3m30.fsf@gmail.com> <87o7l9467s.fsf@jpoiret.xyz> Date: Mon, 26 Jun 2023 09:26:30 -0400 In-Reply-To: <87o7l9467s.fsf@jpoiret.xyz> (Josselin Poiret's message of "Wed, 21 Jun 2023 09:36:39 +0200") Message-ID: <87mt0m2w3d.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2607:f8b0:4864:20::f30; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qv1-xf30.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: guix-devel-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1687786009; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ZcelCDVrnQfynTucleaU8oOY71imx+LBI0tU1ohG7NA=; b=LADFO5Zwt0ufpdBPoUfyYALJzdKJijxdBRNy3dMHq3+JH55gzA6tBnBfMZmm+XP6hrPXQN kyzHTdIibpEjv9+JnJr3MR/bRGb73cnBkbQuOx08346H//Y30nLgppW5BF9yea4JHtG9i+ M02yMnkrwBoyML9lkbep2TCZIwCSQsaCmAQNpFcRACtOGmhE0SyGMZc0IrVn8bSTQjbbYX Ceu9IP8AXPnC1IYI042uiPfcxxZflhfaMvT4gZlWfqAVaBL65LF0WEaj8exjOuiKEg0hhm pFq/qJB4VyTDCyhhhus1qeSgbdmggxQBcOKp+IpD+mzmVfywCo3sUUrMiiUXZg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=oEPuThDC; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1687786009; a=rsa-sha256; cv=none; b=lrmGI402mSV14h8todXauiBy4JrCgzDJnvxmHlCe6hGGjTJjO0FrUzjLgqSCTYUPGvpME3 AC9f1Krw5c0vJCl5TMXdbZQwncn4l61nEUYhzzhDN655KD+d1Tlk1L5UV4GhJUB47AJLlE IxLIGoKdEsw/3oZZK7D/r7yFByHZXNIr0T/jbpI30A1g7mlkThZWW94UB/qZEDPCO20YwU Zq0qDxUJx5U21JRBwQHjeBFrhMsFIFvVuqmPwC+GTcVc9hT0t87ejPiEiq6TIRy96cHj+K gM47a0PWD3EnnsheadrjsbJjRRpuH/SAuQng/JtF/Ep/HF/zmtcHin/m+7TmWQ== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -6.41 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=oEPuThDC; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: D41683377 X-Spam-Score: -6.41 X-TUID: RdAsPBUPQ0OO Hi Josselin, Josselin Poiret writes: > Hi everyone, > > Maxim Cournoyer writes: > >> I'm not a 'git log' expert myself, but intuitively like you, I'd expect >> the --no-merges one to be useful to hide merge commits! The doc seems >> to confirm that: >> >> --no-merges >> Do not print commits with more than one parent. This is >> exactly the same as --max-parents=1. >> >> Thanks for finding that option. > > I used these kinds of options for the last core-updates merge, and this > one only hides the merge commits themselves, not the merged commits. > For that, you need to use --first-parent. Good to know, thanks for sharing! -- Thanks, Maxim