diff options
| author | Elijah Newren <newren@gmail.com> | 2023-01-25 04:03:47 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-25 09:20:52 -0800 |
| commit | 1a66d8c6f658051a02b6d8f024e80e06fccdcd11 (patch) | |
| tree | 8d67bdb7fd216a530974697cd25dbdd6611b06cf /Documentation/git-rebase.txt | |
| parent | 7d718c552b8fa084f2d5bb9c3e3872cfe558a1eb (diff) | |
| download | git-1a66d8c6f658051a02b6d8f024e80e06fccdcd11.tar.gz | |
rebase: remove --allow-empty-message from incompatible opts
--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.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 6490bc96a1..7d01d1412d 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -647,7 +647,6 @@ are incompatible with the following options: * --merge * --strategy * --strategy-option - * --allow-empty-message * --[no-]autosquash * --rebase-merges * --interactive |