Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Tuomas Ahola <taahol@utu.fi>
Cc: Omri Sarig <omri.sarig13@gmail.com>,  <git@vger.kernel.org>,
	<julia@jvns.ca>,  <me@linux.beauty>,
	 <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH v5] doc: git-rebase: update incompatible options
Date: Fri, 30 Oct 2026 12:31:07 -0700	[thread overview]
Message-ID: <xmqqse1nugsk.fsf@gitster.g> (raw)
In-Reply-To: <20261030192719.8KtoR%taahol@utu.fi> (Tuomas Ahola's message of "Fri, 30 Oct 2026 21:27:19 +0200")

Tuomas Ahola <taahol@utu.fi> writes:

>> Thank you for the review!
>> 
>
> The range-diff against v4 makes it clear that v5 only changed the commit
> message.  Unfortunately, the reroll introduced a new typo:
>
>            section from the option description.
>          - Commit a74b35081c (rebase: drop support for `--preserve-merges`,
>            2021-09-07) removed the `--preserve-merges` option from rebase, which
>     -      removes all incompatibility references to `--ignore-date,
>     +      removes all incompatbiilty references to `--ignore-date,
>            --reset-author-date` and `--signoff`.
>      
> Otherwise v5 looks good to me.  Thanks!

I do not quite get what "all incompatibility references" mean,
though, with or without typofixes.

Thanks.

>
>          Additionally, since 414d924beb (rebase: teach rebase --keep-base,
>          2019-08-27) the `--onto` option is incompatible with `--keep-base`, but
>     -    it is not mentioned in the INCOMPATIBLE OPTIONS section.
>     +    doesn't link to the INCOMPATIBLE OPTIONS section.

  reply	other threads:[~2026-10-30 19:31 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-25 11:07 [PATCH v4] doc: git-rebase: update incompatible options Omri Sarig
2026-10-29  8:03 ` Tuomas Ahola
2026-10-30 16:38 ` [PATCH v5] " Omri Sarig
2026-10-30 19:27   ` Tuomas Ahola
2026-10-30 19:31     ` Junio C Hamano [this message]
2026-10-30 19:57       ` Tuomas Ahola

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

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

  git send-email \
    --in-reply-to=xmqqse1nugsk.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=julia@jvns.ca \
    --cc=me@linux.beauty \
    --cc=omri.sarig13@gmail.com \
    --cc=phillip.wood@dunelm.org.uk \
    --cc=taahol@utu.fi \
    /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. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox