| Message ID | f4fbfd40d4599542b041081880e89075f4ff792b.1674266126.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Commit | 53eb2d8170378c717041e5d7d8a4fe4caec6a59a |
| Headers | show |
| Series | rebase: fix several code/testing/documentation issues around flag incompatibilities | expand |
Hi Elijah On 21/01/2023 01:55, Elijah Newren via GitGitGadget wrote: > From: Elijah Newren <newren@gmail.com> > > --allow-empty-message was turned into a no-op and even documented > as such; the flag is simply ignored. Since the flag is ignored, it > shouldn't be documented as being incompatible with other flags. The patch looks fine. Just to note that #leftoverbits - I notice there is some code in builtin/rebase.c, builtin/revert.c and sequencer.[ch] related to this option that could be removed. The setting seems to be completely ignored by the sequencer and so could be removed from struct replay_opts. Best Wishes Phillip > Signed-off-by: Elijah Newren <newren@gmail.com> > --- > Documentation/git-rebase.txt | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt > index 00d21d7287d..3929535c0cd 100644 > --- a/Documentation/git-rebase.txt > +++ b/Documentation/git-rebase.txt > @@ -640,7 +640,6 @@ are incompatible with the following options: > * --merge > * --strategy > * --strategy-option > - * --allow-empty-message > * --[no-]autosquash > * --rebase-merges > * --interactive
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 00d21d7287d..3929535c0cd 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -640,7 +640,6 @@ are incompatible with the following options: * --merge * --strategy * --strategy-option - * --allow-empty-message * --[no-]autosquash * --rebase-merges * --interactive