{"thread":{"id":"66586","subject":"[PATCH v2] doc: git-rebase: Update incompatible options","startedAt":"2026-10-19T14:35:45Z","lastAt":"2026-10-20T09:39:13Z","messageCount":3,"participants":["Omri Sarig","Junio C Hamano","Phillip Wood"],"isPatch":true,"patchVersion":2,"patchTotal":null},"messages":[{"id":"555422","messageId":"20261019143546.207295-1-omri.sarig13@gmail.com","threadId":"66586","inReplyTo":null,"subject":"[PATCH v2] doc: git-rebase: Update incompatible options","fromName":"Omri Sarig","fromEmail":"omri.sarig13@gmail.com","sentAt":"2026-10-19T14:35:45Z","receivedAt":"2026-10-19T14:35:45Z","isPatch":true,"sender":{"key":"omri.sarig13@gmail.com","avatar":"https://avatars.githubusercontent.com/u/42355507?v=4"},"body":"Several options in the rebase man page link to the \"INCOMPATIBLE\nOPTIONS\" section when the option is no-longer incompatible with any\nother option.\n\n- Commit 1a66d8c6f6 (rebase: remove --allow-empty-message from\n  incompatible opts, 2023-01-25) removed \"--allow-empty-message\" from\n  the INCOMPATIBLE OPTIONS section, but did not remove the link to that\n  section from the option description.\n- Commit a74b35081c (rebase: drop support for `--preserve-merges`,\n  2021-09-07) removed the `--preserve-merges` option from rebase, which\n  removes all incompatbiilty references to `--ignore-date,\n  --reset-author-date` and `--signoff`.\n\nAdditionally, `--onto` doesn't link to the INCOMPATIBLE OPTIONS section, even\nthough it is incompatible with `--keep-base`.\n\nUpdate the description of these option, to have correct references to\nthe INCOMPATIBLE OPTIONS section.\n\nSigned-off-by: Omri Sarig <omri.sarig13@gmail.com>\n---\n\nChanges in V2:\n- Update commit message per the review comments from Phillip (Thanks for the\n  review!).\n- Add `--onto` to INCOMPATIEBLE OPTIONS.\n\nI was not sure if both adding INCOMPATIBLE OPTIONS (--onto) and removing them\n(the other flags) belong in the same commit, or in 2 separate commits. These\nchanges felt small enough to me to not require a second commit, but please let\nme know if it's preferred. I'll happily send a new patch where these changes\nare split across different commits.\n\n Documentation/git-rebase.adoc | 8 ++------\n 1 file changed, 2 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/git-rebase.adoc b/Documentation/git-rebase.adoc\nindex 6536ebdc90..6363b1a096 100644\n--- a/Documentation/git-rebase.adoc\n+++ b/Documentation/git-rebase.adoc\n@@ -218,6 +218,8 @@ OPTIONS\n As a special case, you may use \"A\\...B\" as a shortcut for the\n merge base of A and B if there is exactly one merge base. You can\n leave out at most one of A and B, in which case it defaults to HEAD.\n++\n+See also <<INCOMPATIBLE_OPTIONS,INCOMPATIBLE OPTIONS>> below.\n \n See <<TRANSPLANTING,TRANSPLANTING A TOPIC BRANCH WITH --ONTO>>\n above for examples.\n@@ -334,8 +336,6 @@ See also <<INCOMPATIBLE_OPTIONS,INCOMPATIBLE OPTIONS>> below.\n \tand this option would override that behavior, allowing commits\n \twith empty messages to be rebased.  Now commits with an empty\n \tmessage do not cause rebasing to halt.\n-+\n-See also <<INCOMPATIBLE_OPTIONS,INCOMPATIBLE OPTIONS>> below.\n \n -m::\n --merge::\n@@ -489,15 +489,11 @@ applying (in terms of the author date).\n \tInstead of using the author date of the original commit, use\n \tthe current time as the\tauthor date of the rebased commit.  This\n \toption implies `--force-rebase`.\n-+\n-See also <<INCOMPATIBLE_OPTIONS,INCOMPATIBLE OPTIONS>> below.\n \n --signoff::\n \tAdd a `Signed-off-by` trailer to all the rebased commits. Note\n \tthat if `--interactive` is given then only commits marked to be\n \tpicked, edited or reworded will have the trailer added.\n-+\n-See also <<INCOMPATIBLE_OPTIONS,INCOMPATIBLE OPTIONS>> below.\n \n --trailer=<trailer>::\n \tAppend the given trailer to every rebased commit message, processed\n\nRange-diff against v1:\n1:  27c94f5ff4 = 1:  27c94f5ff4 doc: git-rebase: Update incompatible options\n\n"},{"id":"555491","messageId":"xmqqcxt5yuip.fsf@gitster.g","threadId":"66586","inReplyTo":"20261019143546.207295-1-omri.sarig13@gmail.com","subject":"Re: [PATCH v2] doc: git-rebase: Update incompatible options","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-10-20T02:29:18Z","receivedAt":"2026-10-20T02:29:18Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Omri Sarig <omri.sarig13@gmail.com> writes:\n\n> Subject: Re: [PATCH v2] doc: git-rebase: Update incompatible options\n\nDowncase \"Update\" here.\n\n> Several options in the rebase man page link to the \"INCOMPATIBLE\n> OPTIONS\" section when the option is no-longer incompatible with any\n> other option.\n>\n> - Commit 1a66d8c6f6 (rebase: remove --allow-empty-message from\n>   incompatible opts, 2023-01-25) removed \"--allow-empty-message\" from\n>   the INCOMPATIBLE OPTIONS section, but did not remove the link to that\n>   section from the option description.\n> - Commit a74b35081c (rebase: drop support for `--preserve-merges`,\n>   2021-09-07) removed the `--preserve-merges` option from rebase, which\n>   removes all incompatbiilty references to `--ignore-date,\n>   --reset-author-date` and `--signoff`.\n>\n> Additionally, `--onto` doesn't link to the INCOMPATIBLE OPTIONS section, even\n> though it is incompatible with `--keep-base`.\n>\n> Update the description of these option, to have correct references to\n> the INCOMPATIBLE OPTIONS section.\n>\n> Signed-off-by: Omri Sarig <omri.sarig13@gmail.com>\n> ---\n\n> I was not sure if both adding INCOMPATIBLE OPTIONS (--onto) and removing them\n> (the other flags) belong in the same commit, or in 2 separate commits. These\n> changes felt small enough to me to not require a second commit, but please let\n> me know if it's preferred. I'll happily send a new patch where these changes\n> are split across different commits.\n\nThey both fall into \"update the stale list of incompatible options\nto code's reality\", which the title of the patch claims to do, so I\nsee no issues there.\n\n\n"},{"id":"555519","messageId":"2a7654ba-bed4-40b6-86ec-cf4014648d31@gmail.com","threadId":"66586","inReplyTo":"20261019143546.207295-1-omri.sarig13@gmail.com","subject":"Re: [PATCH v2] doc: git-rebase: Update incompatible options","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2026-10-20T09:39:13Z","receivedAt":"2026-10-20T09:39:13Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"Hi Omri\n\nThanks for re-rolling - I don't have anything to add to Junios comments on this version\n\nThanks\n\nPhillip\n\nOn 19/10/2026 15:35, Omri Sarig wrote:\n> Several options in the rebase man page link to the \"INCOMPATIBLE\n> OPTIONS\" section when the option is no-longer incompatible with any\n> other option.\n> > - Commit 1a66d8c6f6 (rebase: remove --allow-empty-message from\n>    incompatible opts, 2023-01-25) removed \"--allow-empty-message\" from\n>    the INCOMPATIBLE OPTIONS section, but did not remove the link to that\n>    section from the option description.\n> - Commit a74b35081c (rebase: drop support for `--preserve-merges`,\n>    2021-09-07) removed the `--preserve-merges` option from rebase, which\n>    removes all incompatbiilty references to `--ignore-date,\n>    --reset-author-date` and `--signoff`.\n> > Additionally, `--onto` doesn't link to the INCOMPATIBLE OPTIONS section, even\n> though it is incompatible with `--keep-base`.\n> > Update the description of these option, to have correct references to\n> the INCOMPATIBLE OPTIONS section.\n> > Signed-off-by: Omri Sarig <omri.sarig13@gmail.com>\n> ---\n> > Changes in V2:\n> - Update commit message per the review comments from Phillip (Thanks for the\n>    review!).\n> - Add `--onto` to INCOMPATIEBLE OPTIONS.\n> > I was not sure if both adding INCOMPATIBLE OPTIONS (--onto) and removing them\n> (the other flags) belong in the same commit, or in 2 separate commits. These\n> changes felt small enough to me to not require a second commit, but please let\n> me know if it's preferred. I'll happily send a new patch where these changes\n> are split across different commits.\n> >   Documentation/git-rebase.adoc | 8 ++------\n>   1 file changed, 2 insertions(+), 6 deletions(-)\n> > diff --git a/Documentation/git-rebase.adoc b/Documentation/git-rebase.adoc\n> index 6536ebdc90..6363b1a096 100644\n> --- a/Documentation/git-rebase.adoc\n> +++ b/Documentation/git-rebase.adoc\n> @@ -218,6 +218,8 @@ OPTIONS\n>   As a special case, you may use \"A\\...B\" as a shortcut for the\n>   merge base of A and B if there is exactly one merge base. You can\n>   leave out at most one of A and B, in which case it defaults to HEAD.\n> ++\n> +See also <<INCOMPATIBLE_OPTIONS,INCOMPATIBLE OPTIONS>> below.\n>   >   See <<TRANSPLANTING,TRANSPLANTING A TOPIC BRANCH WITH --ONTO>>\n>   above for examples.\n> @@ -334,8 +336,6 @@ See also <<INCOMPATIBLE_OPTIONS,INCOMPATIBLE OPTIONS>> below.\n>   \tand this option would override that behavior, allowing commits\n>   \twith empty messages to be rebased.  Now commits with an empty\n>   \tmessage do not cause rebasing to halt.\n> -+\n> -See also <<INCOMPATIBLE_OPTIONS,INCOMPATIBLE OPTIONS>> below.\n>   >   -m::\n>   --merge::\n> @@ -489,15 +489,11 @@ applying (in terms of the author date).\n>   \tInstead of using the author date of the original commit, use\n>   \tthe current time as the\tauthor date of the rebased commit.  This\n>   \toption implies `--force-rebase`.\n> -+\n> -See also <<INCOMPATIBLE_OPTIONS,INCOMPATIBLE OPTIONS>> below.\n>   >   --signoff::\n>   \tAdd a `Signed-off-by` trailer to all the rebased commits. Note\n>   \tthat if `--interactive` is given then only commits marked to be\n>   \tpicked, edited or reworded will have the trailer added.\n> -+\n> -See also <<INCOMPATIBLE_OPTIONS,INCOMPATIBLE OPTIONS>> below.\n>   >   --trailer=<trailer>::\n>   \tAppend the given trailer to every rebased commit message, processed\n> > Range-diff against v1:\n> 1:  27c94f5ff4 = 1:  27c94f5ff4 doc: git-rebase: Update incompatible options\n\n\n"}]}