{"thread":{"id":"66573","subject":"[PATCH] doc: git-rebase: Update incompatible options","startedAt":"2026-10-18T13:25:41Z","lastAt":"2026-10-19T13:15:39Z","messageCount":2,"participants":["Omri Sarig","Phillip Wood"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"555347","messageId":"20261018132541.131506-1-omri.sarig13@gmail.com","threadId":"66573","inReplyTo":null,"subject":"[PATCH] doc: git-rebase: Update incompatible options","fromName":"Omri Sarig","fromEmail":"omri.sarig13@gmail.com","sentAt":"2026-10-18T13:25:41Z","receivedAt":"2026-10-18T13:25:41Z","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 were described as incompatible,\nwhere this is no longer the case:\n\n- Commit 1a66d8c6f658051a02b6d8f024e80e06fccdcd11 removed\n  `--allow-empty-message` for the incompatible option list, but did not\n  update the the documentation of the option itself.\n- Commit a74b35081c51adbde3ef01870ba03e859db33be6 removed the\n  `--preserve-merges` option from rebase, which removes all\n  incompatbiilty references to `--ignore-date, --reset-author-date` and\n  `--signoff`.\n\nUpdate the description of these option, to no longer reference the\nINCOMPATIBLE OPTIONS section.\n\nSigned-off-by: Omri Sarig <omri.sarig13@gmail.com>\n---\n\nI've also found out that the option `--onto` is now mentioned in the\nINCOMPATIBLE OPTIONS section, but is not referencing it from its own\ndocumentation. If this is not intentional, I'll happily send another patch/V2\nto address this issue as well.\n\n Documentation/git-rebase.adoc | 6 ------\n 1 file changed, 6 deletions(-)\n\ndiff --git a/Documentation/git-rebase.adoc b/Documentation/git-rebase.adoc\nindex 6536ebdc90..9fd3cf8ce2 100644\n--- a/Documentation/git-rebase.adoc\n+++ b/Documentation/git-rebase.adoc\n@@ -334,8 +334,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 +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,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\n"},{"id":"555413","messageId":"921b3a6e-5d3f-4c75-97c6-35da57c6d76f@gmail.com","threadId":"66573","inReplyTo":"20261018132541.131506-1-omri.sarig13@gmail.com","subject":"Re: [PATCH] doc: git-rebase: Update incompatible options","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2026-10-19T13:15:39Z","receivedAt":"2026-10-19T13:15:39Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"Hi Omri\n\nOn 18/10/2026 14:25, Omri Sarig wrote:\n> Several options in the rebase man page were described as incompatible,\n> where this is no longer the case:\n\nOur convention is to use the present tense when describing the current situation so we'd say\n\nSeveral options in the rebase man page link to the \"INCOMPATIBLE OPTIONS\" section when the option is no-longer incompatible with any other option.\n> > - Commit 1a66d8c6f658051a02b6d8f024e80e06fccdcd11 removed\n>    `--allow-empty-message` for the incompatible option list, but did not\n>    update the the documentation of the option itself.\n\nIt is very helpful to link to the commit that introduced the change like this, but we format commit references in commit messages with \"git log --format=reference\" so this would be\n\nCommit 1a66d8c6f6 (rebase: remove --allow-empty-message from incompatible opts, 2023-01-25) removed \"--allow-empty-message\" from the INCOMPATIBLE OPTIONS section, but did not remove the link to that section from the option description.\n\n\n> - Commit a74b35081c51adbde3ef01870ba03e859db33be6 removed the\n>    `--preserve-merges` option from rebase, which removes all\n>    incompatbiilty references to `--ignore-date, --reset-author-date` and\n>    `--signoff`.\n\nThe same applies here\n\n> Update the description of these option, to no longer reference the\n> INCOMPATIBLE OPTIONS section.\n\nExcellent\n> Signed-off-by: Omri Sarig <omri.sarig13@gmail.com>\n> ---\n> > I've also found out that the option `--onto` is now mentioned in the\n> INCOMPATIBLE OPTIONS section, but is not referencing it from its own\n> documentation. If this is not intentional, I'll happily send another patch/V2\n> to address this issue as well.\n\n\"--onto\" is incompatible with \"--keep-base\" and \"--keep-base\" links to INCOMPATIBLE OPTIONS so \"--onto\" should probably do so too.\n\nThe changes below all look correct, thanks for improving the documentation.\n\nPhillip\n\n>   Documentation/git-rebase.adoc | 6 ------\n>   1 file changed, 6 deletions(-)\n> > diff --git a/Documentation/git-rebase.adoc b/Documentation/git-rebase.adoc\n> index 6536ebdc90..9fd3cf8ce2 100644\n> --- a/Documentation/git-rebase.adoc\n> +++ b/Documentation/git-rebase.adoc\n> @@ -334,8 +334,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 +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,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\n\n"}]}