{"thread":{"id":"66657","subject":"[PATCH v4] doc: git-rebase: update incompatible options","startedAt":"2026-10-25T11:07:59Z","lastAt":"2026-11-10T18:10:46Z","messageCount":12,"participants":["Omri Sarig","Tuomas Ahola","Junio C Hamano","Julia Evans"],"isPatch":true,"patchVersion":4,"patchTotal":null},"messages":[{"id":"556210","messageId":"20261025110759.204336-1-omri.sarig13@gmail.com","threadId":"66657","inReplyTo":null,"subject":"[PATCH v4] doc: git-rebase: update incompatible options","fromName":"Omri Sarig","fromEmail":"omri.sarig13@gmail.com","sentAt":"2026-10-25T11:07:59Z","receivedAt":"2026-10-25T11:07:59Z","isPatch":true,"sender":{"key":"omri.sarig13@gmail.com","avatar":"https://avatars.githubusercontent.com/u/42355507?v=4"},"body":"A few options in the rebase manual page link to the \"INCOMPATIBLE\nOPTIONS\" section, but they are no longer incompatible with any other\noption:\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 incompatibility references to `--ignore-date,\n  --reset-author-date` and `--signoff`.\n\nAdditionally, since 414d924beb (rebase: teach rebase --keep-base,\n2019-08-27) the `--onto` option is incompatible with `--keep-base`, but\nit is not mentioned in the INCOMPATIBLE OPTIONS section.\n\nUpdate the description of these options, to have correct references to\nthe INCOMPATIBLE OPTIONS section.\n\nSigned-off-by: Omri Sarig <omri.sarig13@gmail.com>\n---\n\nThank you for the review!\n\nChanges in V2:\n- Update commit message per the review comments from Phillip (Thanks for the\n  review!).\n- Add `--onto` to INCOMPATIBLE OPTIONS.\n\nChanges in V3:\n- Downcase \"Update\" in commit title\n\nChanges in V4:\n- Update the commit message per review comments.\n- Rebase the patch to be compatible with the maint branch.\n\nThe main difference in git-rebase.adoc between the maintenance branch and the\nmain branch was created in 2fc11e3382 (doc: add more AsciiDoc cross-references,\n2026-09-25), which turned all the \"See also...\" lines into links. This created\nconflicts with the removed lines, which I've solved.\nI was not sure what is the correct way to add the new INCOMPATIBLE OPTION line\nin this patch. As I see it, this line can be aligned with the current version\nof the file (without the link), or \"correct\" for the final version of the file\n(with the link). Here, I opted to adding this line in the aligned form for the\nmaintenance branch. This will require some work when merging this change to the\nmain branch, as this new line will have to be updated.\nI was not sure if this is the correct strategy. If the right way to do it, is\nto add the \"final\" version of the line, please let me know, and I'll provide a\nV5.\n\nThank you for the support in helping me get this through.\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 f6c22d1598..f1f675d311 100644\n--- a/Documentation/git-rebase.adoc\n+++ b/Documentation/git-rebase.adoc\n@@ -217,6 +217,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 below.\n \n See TRANSPLANTING A TOPIC BRANCH WITH --ONTO above for examples.\n \n@@ -332,8 +334,6 @@ See also 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 below.\n \n -m::\n --merge::\n@@ -487,15 +487,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 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 below.\n \n --trailer=<trailer>::\n \tAppend the given trailer to every rebased commit message, processed\n\n"},{"id":"556731","messageId":"20261029080317.wWchf%taahol@utu.fi","threadId":"66657","inReplyTo":"20261025110759.204336-1-omri.sarig13@gmail.com","subject":"Re: [PATCH v4] doc: git-rebase: update incompatible options","fromName":"Tuomas Ahola","fromEmail":"taahol@utu.fi","sentAt":"2026-10-29T08:03:17Z","receivedAt":"2026-10-29T08:03:17Z","isPatch":true,"sender":{"key":"taahol@utu.fi","avatar":"https://avatars.githubusercontent.com/u/114303477?v=4"},"body":"[administrivia]\n  Please send subsequent rerolls as direct replies to the v4 patch message\n  (git send-email --in-reply-to= ).\n\nOmri Sarig <omri.sarig13@gmail.com> wrote:\n\n> A few options in the rebase manual page link to the \"INCOMPATIBLE\n> OPTIONS\" section, but they are no longer incompatible with any other\n> 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 incompatibility references to `--ignore-date,\n>   --reset-author-date` and `--signoff`.\n> \n\nOkay.  \"INCOMPATIBLE OPTIONS\" says nothing about \"--allow-empty-message\",\n\"--ignore-date\", \"--reset-author-date\", and \"--signoff\", so links from those\nsections to incomp opts have to go.\n\nWell observed!\n\n> Additionally, since 414d924beb (rebase: teach rebase --keep-base,\n> 2019-08-27) the `--onto` option is incompatible with `--keep-base`, but\n> it is not mentioned in the INCOMPATIBLE OPTIONS section.\n> \n\n\"--onto\" is mentioned in incomp opts, but the description doesn't link there.\n\nJust steal the correct wording from the v3 where you had it already right. :-)\n\n> Update the description of these options, to have correct references to\n> the INCOMPATIBLE OPTIONS section.\n> \n> Signed-off-by: Omri Sarig <omri.sarig13@gmail.com>\n> ---\n> \n> Thank you for the review!\n> \n> Changes in V2:\n> - Update commit message per the review comments from Phillip (Thanks for the\n>   review!).\n> - Add `--onto` to INCOMPATIBLE OPTIONS.\n> \n> Changes in V3:\n> - Downcase \"Update\" in commit title\n> \n> Changes in V4:\n> - Update the commit message per review comments.\n> - Rebase the patch to be compatible with the maint branch.\n> \n> The main difference in git-rebase.adoc between the maintenance branch and the\n> main branch was created in 2fc11e3382 (doc: add more AsciiDoc cross-references,\n> 2026-09-25), which turned all the \"See also...\" lines into links. This created\n> conflicts with the removed lines, which I've solved.\n> I was not sure what is the correct way to add the new INCOMPATIBLE OPTION line\n> in this patch. As I see it, this line can be aligned with the current version\n> of the file (without the link), or \"correct\" for the final version of the file\n> (with the link). Here, I opted to adding this line in the aligned form for the\n> maintenance branch. This will require some work when merging this change to the\n> main branch, as this new line will have to be updated.\n\nExcellent!  The patch now applies cleanly to 'maint'.  When this topic has\nsettled down (i.e. merged to 'next'), you would perhaps like to send a followup\npatch as a separate topic.  Such patch would look something like this, if you are\ninterested:\n\n\ndiff --git a/Documentation/git-rebase.adoc b/Documentation/git-rebase.adoc\nindex 6190479966..e9c463da57 100644\n--- a/Documentation/git-rebase.adoc\n+++ b/Documentation/git-rebase.adoc\n@@ -216,13 +216,13 @@ OPTIONS\n \texisting branch name.\n +\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 below.\n+See also <<INCOMPATIBLE_OPTIONS,INCOMPATIBLE OPTIONS>> below.\n \n See <<TRANSPLANTING,TRANSPLANTING A TOPIC BRANCH WITH --ONTO>>\n above for examples.\n \n --keep-base::\n \tSet the starting point at which to create the new commits to the\n@@ -497,13 +497,13 @@ applying (in terms of the author date).\n \n --trailer=<trailer>::\n \tAppend the given trailer to every rebased commit message, processed\n \tvia linkgit:git-interpret-trailers[1]. This option implies\n \t`--force-rebase`.\n +\n-See also INCOMPATIBLE OPTIONS below.\n+See also <<INCOMPATIBLE_OPTIONS,INCOMPATIBLE OPTIONS>> below.\n \n -i::\n --interactive::\n \tMake a list of the commits which are about to be rebased.  Let the\n \tuser edit that list before rebasing.  This mode can also be used to\n \tsplit commits (see <<SPLITTING_COMMITS,SPLITTING COMMITS>> below).\n\n\n> I was not sure if this is the correct strategy. If the right way to do it, is\n> to add the \"final\" version of the line, please let me know, and I'll provide a\n> V5.\n> \n> Thank you for the support in helping me get this through.\n> \n>  Documentation/git-rebase.adoc | 8 ++------\n>  1 file changed, 2 insertions(+), 6 deletions(-)\n> \n> diff --git a/Documentation/git-rebase.adoc b/Documentation/git-rebase.adoc\n> index f6c22d1598..f1f675d311 100644\n> --- a/Documentation/git-rebase.adoc\n> +++ b/Documentation/git-rebase.adoc\n> @@ -217,6 +217,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 below.\n>  \n>  See TRANSPLANTING A TOPIC BRANCH WITH --ONTO above for examples.\n>  \n> @@ -332,8 +334,6 @@ See also 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 below.\n>  \n>  -m::\n>  --merge::\n> @@ -487,15 +487,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 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 below.\n>  \n>  --trailer=<trailer>::\n>  \tAppend the given trailer to every rebased commit message, processed\n\nThe changes are good to go, but see my nit for the commit log message.\n\n--Tuomas\n\n"},{"id":"556933","messageId":"20261030163841.31840-1-omri.sarig13@gmail.com","threadId":"66657","inReplyTo":"20261025110759.204336-1-omri.sarig13@gmail.com","subject":"[PATCH v5] doc: git-rebase: update incompatible options","fromName":"Omri Sarig","fromEmail":"omri.sarig13@gmail.com","sentAt":"2026-10-30T16:38:41Z","receivedAt":"2026-10-30T16:38:41Z","isPatch":true,"sender":{"key":"omri.sarig13@gmail.com","avatar":"https://avatars.githubusercontent.com/u/42355507?v=4"},"body":"A few options in the rebase manual page link to the \"INCOMPATIBLE\nOPTIONS\" section, but they are no longer incompatible with any other\noption:\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, since 414d924beb (rebase: teach rebase --keep-base,\n2019-08-27) the `--onto` option is incompatible with `--keep-base`, but\ndoesn't link to the INCOMPATIBLE OPTIONS section.\n\nUpdate the description of these options, to have correct references to\nthe INCOMPATIBLE OPTIONS section.\n\nSigned-off-by: Omri Sarig <omri.sarig13@gmail.com>\n---\n\nThank you for the review!\n\nChanges in V2:\n- Update commit message per the review comments from Phillip (Thanks for the\n  review!).\n- Add `--onto` to INCOMPATIBLE OPTIONS.\n\nChanges in V3:\n- Downcase \"Update\" in commit title\n\nChanges in V4:\n- Update the commit message per review comments.\n- Rebase the patch to be compatible with the maint branch.\n\nChanges in V5:\n- Update commit message, making it clear that the `--onto` option was only\n  missing the INCOMPATIBLE OPTIONS link.\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 f6c22d1598..f1f675d311 100644\n--- a/Documentation/git-rebase.adoc\n+++ b/Documentation/git-rebase.adoc\n@@ -217,6 +217,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 below.\n \n See TRANSPLANTING A TOPIC BRANCH WITH --ONTO above for examples.\n \n@@ -332,8 +334,6 @@ See also 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 below.\n \n -m::\n --merge::\n@@ -487,15 +487,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 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 below.\n \n --trailer=<trailer>::\n \tAppend the given trailer to every rebased commit message, processed\n\n"},{"id":"556955","messageId":"20261030192719.8KtoR%taahol@utu.fi","threadId":"66657","inReplyTo":"20261030163841.31840-1-omri.sarig13@gmail.com","subject":"Re: [PATCH v5] doc: git-rebase: update incompatible options","fromName":"Tuomas Ahola","fromEmail":"taahol@utu.fi","sentAt":"2026-10-30T19:27:19Z","receivedAt":"2026-10-30T19:27:19Z","isPatch":true,"sender":{"key":"taahol@utu.fi","avatar":"https://avatars.githubusercontent.com/u/114303477?v=4"},"body":"Omri Sarig <omri.sarig13@gmail.com> wrote:\n\n> A few options in the rebase manual page link to the \"INCOMPATIBLE\n> OPTIONS\" section, but they are no longer incompatible with any other\n> 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> \n> Additionally, since 414d924beb (rebase: teach rebase --keep-base,\n> 2019-08-27) the `--onto` option is incompatible with `--keep-base`, but\n> doesn't link to the INCOMPATIBLE OPTIONS section.\n> \n> Update the description of these options, to have correct references to\n> the INCOMPATIBLE OPTIONS section.\n> \n> Signed-off-by: Omri Sarig <omri.sarig13@gmail.com>\n> ---\n> \n> Thank you for the review!\n> \n\nThe range-diff against v4 makes it clear that v5 only changed the commit\nmessage.  Unfortunately, the reroll introduced a new typo:\n\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 incompatibility references to `--ignore-date,\n    +      removes all incompatbiilty references to `--ignore-date,\n           --reset-author-date` and `--signoff`.\n     \nOtherwise v5 looks good to me.  Thanks!\n\n         Additionally, since 414d924beb (rebase: teach rebase --keep-base,\n         2019-08-27) the `--onto` option is incompatible with `--keep-base`, but\n    -    it is not mentioned in the INCOMPATIBLE OPTIONS section.\n    +    doesn't link to the INCOMPATIBLE OPTIONS section.\n\n"},{"id":"556956","messageId":"xmqqse1nugsk.fsf@gitster.g","threadId":"66657","inReplyTo":"20261030192719.8KtoR%taahol@utu.fi","subject":"Re: [PATCH v5] doc: git-rebase: update incompatible options","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-10-30T19:31:07Z","receivedAt":"2026-10-30T19:31:07Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Tuomas Ahola <taahol@utu.fi> writes:\n\n>> Thank you for the review!\n>> \n>\n> The range-diff against v4 makes it clear that v5 only changed the commit\n> message.  Unfortunately, the reroll introduced a new typo:\n>\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 incompatibility references to `--ignore-date,\n>     +      removes all incompatbiilty references to `--ignore-date,\n>            --reset-author-date` and `--signoff`.\n>      \n> Otherwise v5 looks good to me.  Thanks!\n\nI do not quite get what \"all incompatibility references\" mean,\nthough, with or without typofixes.\n\nThanks.\n\n>\n>          Additionally, since 414d924beb (rebase: teach rebase --keep-base,\n>          2019-08-27) the `--onto` option is incompatible with `--keep-base`, but\n>     -    it is not mentioned in the INCOMPATIBLE OPTIONS section.\n>     +    doesn't link to the INCOMPATIBLE OPTIONS section.\n\n"},{"id":"556958","messageId":"20261030195713.ajPKo%taahol@utu.fi","threadId":"66657","inReplyTo":"xmqqse1nugsk.fsf@gitster.g","subject":"Re: [PATCH v5] doc: git-rebase: update incompatible options","fromName":"Tuomas Ahola","fromEmail":"taahol@utu.fi","sentAt":"2026-10-30T19:57:13Z","receivedAt":"2026-10-30T19:57:13Z","isPatch":true,"sender":{"key":"taahol@utu.fi","avatar":"https://avatars.githubusercontent.com/u/114303477?v=4"},"body":"Junio C Hamano <gitster@pobox.com> wrote:\n\n> Tuomas Ahola <taahol@utu.fi> writes:\n> \n> >> Thank you for the review!\n> >> \n> >\n> > The range-diff against v4 makes it clear that v5 only changed the commit\n> > message.  Unfortunately, the reroll introduced a new typo:\n> >\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 incompatibility references to `--ignore-date,\n> >     +      removes all incompatbiilty references to `--ignore-date,\n> >            --reset-author-date` and `--signoff`.\n> >      \n> > Otherwise v5 looks good to me.  Thanks!\n> \n> I do not quite get what \"all incompatibility references\" mean,\n> though, with or without typofixes.\n> \n\nUm, yeah.  I agree.  Perhaps something like this would scan better?\n\n- Commit a74b35081c (rebase: drop support for `--preserve-merges`,\n  2021-09-07) removed the `--preserve-merges` option which was the\n  only one at odds with `--ignore-date`, `--reset-author-date` and\n  `--signoff`.\n\n> Thanks.\n> \n> >\n> >          Additionally, since 414d924beb (rebase: teach rebase --keep-base,\n> >          2019-08-27) the `--onto` option is incompatible with `--keep-base`, but\n> >     -    it is not mentioned in the INCOMPATIBLE OPTIONS section.\n> >     +    doesn't link to the INCOMPATIBLE OPTIONS section.\n\n"},{"id":"557067","messageId":"20261101082230.141688-1-omri.sarig13@gmail.com","threadId":"66657","inReplyTo":"20261025110759.204336-1-omri.sarig13@gmail.com","subject":"[PATCH v6] doc: git-rebase: update incompatible options","fromName":"Omri Sarig","fromEmail":"omri.sarig13@gmail.com","sentAt":"2026-11-01T08:22:30Z","receivedAt":"2026-11-01T08:22:30Z","isPatch":true,"sender":{"key":"omri.sarig13@gmail.com","avatar":"https://avatars.githubusercontent.com/u/42355507?v=4"},"body":"A few options in the rebase manual page link to the \"INCOMPATIBLE\nOPTIONS\" section, but they are no longer incompatible with any other\noption:\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 which was the\n  only one at odds with `--ignore-date`, `--reset-author-date` and\n  `--signoff`.\n\nAdditionally, since 414d924beb (rebase: teach rebase --keep-base,\n2019-08-27) the `--onto` option is incompatible with `--keep-base`, but\ndoesn't link to the INCOMPATIBLE OPTIONS section.\n\nUpdate the description of these options, to have correct references to\nthe INCOMPATIBLE OPTIONS section.\n\nSigned-off-by: Omri Sarig <omri.sarig13@gmail.com>\n---\n\nThank you for the review!\n\nChanges in V2:\n- Update commit message per the review comments from Phillip (Thanks for the\n  review!).\n- Add `--onto` to INCOMPATIBLE OPTIONS.\n\nChanges in V3:\n- Downcase \"Update\" in commit title\n\nChanges in V4:\n- Update the commit message per review comments.\n- Rebase the patch to be compatible with the maint branch.\n\nChanges in V5:\n- Update commit message, making it clear that the `--onto` option was only\n  missing the INCOMPATIBLE OPTIONS link.\n\nChanges in V6:\n- Update the commit message per the review comments, making it clearer.\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 f6c22d1598..f1f675d311 100644\n--- a/Documentation/git-rebase.adoc\n+++ b/Documentation/git-rebase.adoc\n@@ -217,6 +217,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 below.\n \n See TRANSPLANTING A TOPIC BRANCH WITH --ONTO above for examples.\n \n@@ -332,8 +334,6 @@ See also 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 below.\n \n -m::\n --merge::\n@@ -487,15 +487,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 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 below.\n \n --trailer=<trailer>::\n \tAppend the given trailer to every rebased commit message, processed\n\n"},{"id":"557967","messageId":"258741fc-5dbe-4268-948a-9ae298ddc83d@gmail.com","threadId":"66657","inReplyTo":"20261101082230.141688-1-omri.sarig13@gmail.com","subject":"Re: [PATCH v6] doc: git-rebase: update incompatible options","fromName":"Omri Sarig","fromEmail":"omri.sarig13@gmail.com","sentAt":"2026-11-09T17:23:35Z","receivedAt":"2026-11-09T17:23:35Z","isPatch":true,"sender":{"key":"omri.sarig13@gmail.com","avatar":"https://avatars.githubusercontent.com/u/42355507?v=4"},"body":"On 01/11/2026 09.22, Omri Sarig wrote:\n> A few options in the rebase manual page link to the \"INCOMPATIBLE\n> OPTIONS\" section, but they are no longer incompatible with any other\n> 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 which was the\n>    only one at odds with `--ignore-date`, `--reset-author-date` and\n>    `--signoff`.\n>\n> Additionally, since 414d924beb (rebase: teach rebase --keep-base,\n> 2019-08-27) the `--onto` option is incompatible with `--keep-base`, but\n> doesn't link to the INCOMPATIBLE OPTIONS section.\n>\n> Update the description of these options, to have correct references to\n> the INCOMPATIBLE OPTIONS section.\n>\n> Signed-off-by: Omri Sarig <omri.sarig13@gmail.com>\n> ---\n>\n> Thank you for the review!\n>\n> Changes in V2:\n> - Update commit message per the review comments from Phillip (Thanks for the\n>    review!).\n> - Add `--onto` to INCOMPATIBLE OPTIONS.\n>\n> Changes in V3:\n> - Downcase \"Update\" in commit title\n>\n> Changes in V4:\n> - Update the commit message per review comments.\n> - Rebase the patch to be compatible with the maint branch.\n>\n> Changes in V5:\n> - Update commit message, making it clear that the `--onto` option was only\n>    missing the INCOMPATIBLE OPTIONS link.\n>\n> Changes in V6:\n> - Update the commit message per the review comments, making it clearer.\n>\n>   Documentation/git-rebase.adoc | 8 ++------\n>   1 file changed, 2 insertions(+), 6 deletions(-)\n>\n> diff --git a/Documentation/git-rebase.adoc b/Documentation/git-rebase.adoc\n> index f6c22d1598..f1f675d311 100644\n> --- a/Documentation/git-rebase.adoc\n> +++ b/Documentation/git-rebase.adoc\n> @@ -217,6 +217,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 below.\n>   >   See TRANSPLANTING A TOPIC BRANCH WITH --ONTO above for examples.\n>   > @@ -332,8 +334,6 @@ See also 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 below.\n>   >   -m::\n>   --merge::\n> @@ -487,15 +487,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 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 below.\n>   >   --trailer=<trailer>::\n>   \tAppend the given trailer to every rebased commit message, processed\n\nHi,\n\nThis patch has been sitting around for some time without a review.\n\nAnyone that is interested in reviewing it?\nAnything more I can do from my side to help this process?\n\nThanks!\nOmri\n\n\n"},{"id":"558086","messageId":"eaa965fa-05fa-4945-aacb-2fc99b02159d@app.fastmail.com","threadId":"66657","inReplyTo":"20261101082230.141688-1-omri.sarig13@gmail.com","subject":"Re: [PATCH v6] doc: git-rebase: update incompatible options","fromName":"Julia Evans","fromEmail":"julia@jvns.ca","sentAt":"2026-11-10T14:06:35Z","receivedAt":"2026-11-10T14:06:35Z","isPatch":true,"sender":{"key":"julia@jvns.ca","avatar":"https://avatars.githubusercontent.com/u/817739?v=4"},"body":"> @@ -217,6 +217,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 below.\n\nElsewhere in the document we're now linking to the section like this,\nsince 2fc11e33820:\n\nSee also <<INCOMPATIBLE_OPTIONS,INCOMPATIBLE OPTIONS>> below.\n\nI think it would be good to keep things consistent.\n\nAlso it would be good to try to convert up all remaining internal links that\naren't using the << >>, I may try to do that at some point.\n\n"},{"id":"558096","messageId":"b77fcd1c-21aa-4029-91d2-38c89a53f788@gmail.com","threadId":"66657","inReplyTo":"eaa965fa-05fa-4945-aacb-2fc99b02159d@app.fastmail.com","subject":"Re: [PATCH v6] doc: git-rebase: update incompatible options","fromName":"Omri Sarig","fromEmail":"omri.sarig13@gmail.com","sentAt":"2026-11-10T15:37:57Z","receivedAt":"2026-11-10T15:37:57Z","isPatch":true,"sender":{"key":"omri.sarig13@gmail.com","avatar":"https://avatars.githubusercontent.com/u/42355507?v=4"},"body":"\nOn 10/11/2026 15.06, Julia Evans wrote:\n>> @@ -217,6 +217,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 below.\nThank you for looking at it!\n> Elsewhere in the document we're now linking to the section like this,\n> since 2fc11e33820:\n\nAs per Junio's request (https://lore.kernel.org/git/xmqqjyncxrur.fsf@gitster.g/), the current version is built over the 'maint' branch, and therefore does not have 2fc11e33820 available yet.\n\nI've discussed  whether this update should include the links, or not include them, and understood from Tuomas that the right way to do it here, is to keep the file consistent with itself in the maintenance branch version of it, and update the links everywhere in a future patch (discussed here: https://lore.kernel.org/git/20261029080317.wWchf%25taahol@utu.fi/).\nAdditionally, the INCOMPATIBLE OPTIONS section cannot be a target to a link yet, so this won't apply cleanly to the 'maint' branch with these links.\n\nPlease let me know if I should update these links, or keep them consistent with the rest of the file in the 'maint' branch.\n\n>\n> See also <<INCOMPATIBLE_OPTIONS,INCOMPATIBLE OPTIONS>> below.\n>\n> I think it would be good to keep things consistent.\n>\n> Also it would be good to try to convert up all remaining internal links that\n> aren't using the << >>, I may try to do that at some point.\n\nAs far as I can see, the only place that does not have a link to the INCOMPATIBLE OPTIONS section in the master branch is the --trailer option.\n\nIf you want me to, I'll happily update the added section, together with the trailer options, once both are merge.\n\n\nThanks,\nOmri\n\n\n"},{"id":"558120","messageId":"b5bf86d8-5a2c-4035-a8c6-f6e8c44cf7de@app.fastmail.com","threadId":"66657","inReplyTo":"b77fcd1c-21aa-4029-91d2-38c89a53f788@gmail.com","subject":"Re: [PATCH v6] doc: git-rebase: update incompatible options","fromName":"Julia Evans","fromEmail":"julia@jvns.ca","sentAt":"2026-11-10T17:59:26Z","receivedAt":"2026-11-10T17:59:26Z","isPatch":true,"sender":{"key":"julia@jvns.ca","avatar":"https://avatars.githubusercontent.com/u/817739?v=4"},"body":"\n>>> +See also INCOMPATIBLE OPTIONS below.\n> Thank you for looking at it!\n>> Elsewhere in the document we're now linking to the section like this,\n>> since 2fc11e33820:\n>\n> As per Junio's request \n> (https://lore.kernel.org/git/xmqqjyncxrur.fsf@gitster.g/), the current \n> version is built over the 'maint' branch, and therefore does not have \n> 2fc11e33820 available yet.\n>\n> I've discussed  whether this update should include the links, or not \n> include them, and understood from Tuomas that the right way to do it \n> here, is to keep the file consistent with itself in the maintenance \n> branch version of it, and update the links everywhere in a future patch \n> (discussed here: \n> https://lore.kernel.org/git/20261029080317.wWchf%25taahol@utu.fi/).\n> Additionally, the INCOMPATIBLE OPTIONS section cannot be a target to a \n> link yet, so this won't apply cleanly to the 'maint' branch with these \n> links.\n>\n> Please let me know if I should update these links, or keep them \n> consistent with the rest of the file in the 'maint' branch.\n\nAh, I hadn't read that part of the thread, sorry about that! I'm not\nfamiliar with the process around the `maint` branch so I definitely\ndon't have opinions about how that should work.\n\nThanks for explaining it!\n\n"},{"id":"558122","messageId":"xmqqa4ngsgk9.fsf@gitster.g","threadId":"66657","inReplyTo":"20261101082230.141688-1-omri.sarig13@gmail.com","subject":"Re: [PATCH v6] doc: git-rebase: update incompatible options","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-11-10T18:10:46Z","receivedAt":"2026-11-10T18:10:46Z","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> Changes in V6:\n> - Update the commit message per the review comments, making it clearer.\n>\n>  Documentation/git-rebase.adoc | 8 ++------\n>  1 file changed, 2 insertions(+), 6 deletions(-)\n>\n> diff --git a/Documentation/git-rebase.adoc b/Documentation/git-rebase.adoc\n> index f6c22d1598..f1f675d311 100644\n> --- a/Documentation/git-rebase.adoc\n> +++ b/Documentation/git-rebase.adoc\n> @@ -217,6 +217,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 below.\n>  \n>  See TRANSPLANTING A TOPIC BRANCH WITH --ONTO above for examples.\n>  \n> @@ -332,8 +334,6 @@ See also 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 below.\n>  \n>  -m::\n>  --merge::\n> @@ -487,15 +487,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 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 below.\n>  \n>  --trailer=<trailer>::\n>  \tAppend the given trailer to every rebased commit message, processed\n\nLooking good.  Let's mark it as ready for 'next'.\n\n\n"}]}