unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: Josselin Poiret <dev@jpoiret.xyz>
Cc: Giovanni Biscuolo <g@xelera.eu>,
	 Leo Famulari <leo@famulari.name>,
	Felix Lechner <felix.lechner@lease-up.com>,
	 Andreas Enge <andreas@enge.fr>,
	 Christopher Baines <mail@cbaines.net>,
	guix-devel@gnu.org
Subject: Re: Rebasing or merging? [was: Re: 01/03: gnu: wxwidgets: Add libxtst to inputs.]
Date: Mon, 26 Jun 2023 09:26:30 -0400	[thread overview]
Message-ID: <87mt0m2w3d.fsf@gmail.com> (raw)
In-Reply-To: <87o7l9467s.fsf@jpoiret.xyz> (Josselin Poiret's message of "Wed,  21 Jun 2023 09:36:39 +0200")

Hi Josselin,

Josselin Poiret <dev@jpoiret.xyz> writes:

> Hi everyone,
>
> Maxim Cournoyer <maxim.cournoyer@gmail.com> 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


  reply	other threads:[~2023-06-26 13:26 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <168610879676.2825.9044237296073582277@vcs2.savannah.gnu.org>
     [not found] ` <20230607033317.826FCC23EDC@vcs2.savannah.gnu.org>
2023-06-07 10:59   ` 01/03: gnu: wxwidgets: Add libxtst to inputs Christopher Baines
2023-06-11  3:17     ` Maxim Cournoyer
2023-06-11  8:44       ` Rebasing or merging? [was: Re: 01/03: gnu: wxwidgets: Add libxtst to inputs.] Andreas Enge
2023-06-11 21:25         ` Maxim Cournoyer
2023-06-11 22:40           ` Felix Lechner via Development of GNU Guix and the GNU System distribution.
2023-06-12  0:47             ` Maxim Cournoyer
2023-06-12  1:10               ` Felix Lechner via Development of GNU Guix and the GNU System distribution.
2023-06-12 12:22                 ` Maxim Cournoyer
2023-06-12 13:13                 ` Andreas Enge
2023-06-12 13:47                   ` Maxim Cournoyer
2023-06-13  2:07               ` Leo Famulari
2023-06-14  1:32                 ` Maxim Cournoyer
2023-06-20 17:15                   ` Giovanni Biscuolo
2023-06-20 20:39                     ` Maxim Cournoyer
2023-06-21  7:36                       ` Josselin Poiret
2023-06-26 13:26                         ` Maxim Cournoyer [this message]
2023-06-20 16:32                 ` Giovanni Biscuolo
2023-06-11  9:25       ` 01/03: gnu: wxwidgets: Add libxtst to inputs Christopher Baines
2023-06-11 21:20         ` Maxim Cournoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87mt0m2w3d.fsf@gmail.com \
    --to=maxim.cournoyer@gmail.com \
    --cc=andreas@enge.fr \
    --cc=dev@jpoiret.xyz \
    --cc=felix.lechner@lease-up.com \
    --cc=g@xelera.eu \
    --cc=guix-devel@gnu.org \
    --cc=leo@famulari.name \
    --cc=mail@cbaines.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).