From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id kBf7AsOokmQmAgEASxT56A (envelope-from ) for ; Wed, 21 Jun 2023 09:37:39 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 8GLXAsOokmQIcgAAauVa8A (envelope-from ) for ; Wed, 21 Jun 2023 09:37:39 +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 BD283155F3 for ; Wed, 21 Jun 2023 09:37:38 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qBsOm-0006s8-2A; Wed, 21 Jun 2023 03:37:04 -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 1qBsOj-0006rq-Pt for guix-devel@gnu.org; Wed, 21 Jun 2023 03:37:02 -0400 Received: from jpoiret.xyz ([206.189.101.64]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qBsOi-0002TJ-15 for guix-devel@gnu.org; Wed, 21 Jun 2023 03:37:01 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 73FE71851E7; Wed, 21 Jun 2023 07:36:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1687333016; h=from:from: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; bh=jVce0qiz3Mt4yTTi+OXrEeYQFxyEv+iOQ8R6BjcNo98=; b=fwC4Gz7bVfo5Ipw3o8/Rm66Ro/EqV8GJZAwuAZmnHtAX6XdghfxFftDWES0omh/cj0GqaQ YS6Q8wIC9kRb7PQGGUI4QzBvzdMFWiTsvn/bgrjXyVSyKCTvDY6KkCmAbdfNelO2BLArsO uhfvAztzxh4oOENDA6YVTYicZmofiEZJp5Fi8kWFiXhtXk80g3NgxEvB652EwUNmi4LR2g eVTKzU2L7JXnQn8jehrsIqRcE0bAv541vAEgg7eNxZJHytx4EgWXwt3NYlfHgaaUJgYV38 +RjAuTtx+f5aMtRKKnBMH6OeAEclPtCTfyXJuW28TVCV3T6ntP5/6xUton0m1Q== From: Josselin Poiret To: Maxim Cournoyer , Giovanni Biscuolo Cc: 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.] In-Reply-To: <87v8fh3m30.fsf@gmail.com> 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> Date: Wed, 21 Jun 2023 09:36:39 +0200 Message-ID: <87o7l9467s.fsf@jpoiret.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spamd-Bar: + Received-SPF: pass client-ip=206.189.101.64; envelope-from=dev@jpoiret.xyz; helo=jpoiret.xyz 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, SPF_HELO_PASS=-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=1687333058; 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=jVce0qiz3Mt4yTTi+OXrEeYQFxyEv+iOQ8R6BjcNo98=; b=CI1jg9qK4tobgBGBC9sXhNSLIEHHcRM9iql3zYj8bIu0CW2Gw/aSe4YXWEDdG0bc9d2KZk SvVMbgstLD+mzSDK9k1GT3Xp0c2Pe0UIS+Q1ljx9LEABO0xOSG273Mn0fSsKVYifPlSlgP MgMS+fsu3tstbDgRodiHcV7E313t0FjiZmxrptVa5PXKcosw5d3RGfk5V4Zdu3NleJQfT9 9GaiBnd7Ov3jc6hfuFvqK27RtE/MbLzU3CeKIr2P5tjm91zC9/DuF/mg/lBWIvXYiwNcAx sIurPx1sfkYc2sWJBVJKrDbltqiZFAEEc1MH4JjfbmMlYL/qTII8ssQt5aNyZQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=jpoiret.xyz header.s=dkim header.b=fwC4Gz7b; dmarc=pass (policy=reject) header.from=jpoiret.xyz; 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=1687333058; a=rsa-sha256; cv=none; b=IBZKRZ9Q25bJTeWwYhOVOHjjzDHg3zUqX+wjXdhtgf1Wx5gSBCIKqJrrIPw0s50LDGjITu UCThedUfxD4dMQLpNrdPBgZOVVVhax0ZFeJq6exN/HI36wFCTNsravavysffpTkwA481dn 1dzDVd5h45NfNJFKXUkQSFPY45PZ7zrXZPSAoejR8xBXy2PortF7Qx3FJFjMySlhjFRt6U YzpBfPECnloOw02CexfJahfyRRAkLZQ/VM3FaAksqi46iCJgjbjBZBoYdz2Jk/fCCfdp3q a/OOIaXJ7rY4p8GuDFpbNLddwxNRunHUmCnln2+fLck6K8rCoTlOC0mzFjrnBA== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -4.35 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=jpoiret.xyz header.s=dkim header.b=fwC4Gz7b; dmarc=pass (policy=reject) header.from=jpoiret.xyz; 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: BD283155F3 X-Spam-Score: -4.35 X-TUID: WtTFd/JEt9nj --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable 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=3D1. > > 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. Best, =2D-=20 Josselin Poiret --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHEBAEBCgAuFiEEOSSM2EHGPMM23K8vUF5AuRYXGooFAmSSqIcQHGRldkBqcG9p cmV0Lnh5egAKCRBQXkC5FhcaiqrZDACq6DHhMb3i+zytrGSCh+t5KFnkkY8Tzua2 EoSCG2mC+R6WGq9Bj5DPBNEdWCl+G71e82EHQXhPDHbVdBBow1KFa6S+7U/dmV/Y PNtuuKt97oCIczd/TH4HlvrLU3uh45w0LQRefAJI2p0Q4oka+1GPQFE+XpYUjYbW 2re88DaaopmKhzfYN87wlUkWVfXPIPHrtstrnML59oh3GnDobcI3AYpPwSxnMeHY PjHtBiOv+zpsGBFw+sUn/538BejfpQxiiPOTmsCY5B92iK9JSfehysGtgeDJHSVE u7gsfZu9gFKGMzrFlTnfAHwNcrlb1DVRsK1ICd5Slgne0xuaclNJOxNMZjU2k5RB zcQkGoHkTXpnS6IbduI8gC4Y9Ie2LFMsC16lG4Bt5nB/3aAbOZcljL2R4jTeZPAM h2pu1ha68eeJqcWxszI5Nu6ngc4BMj0z4z2hZb8RImzKT002/jJrpuUaLsaou61s 3aZDNaHl+UCzH0370sTx0uQBm+lzUNI= =b0G7 -----END PGP SIGNATURE----- --=-=-=--