diff options
| author | Elijah Newren <newren@gmail.com> | 2020-01-16 06:14:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-17 21:58:30 (GMT) |
| commit | 22a69fda197f78410190469bf0fcb51f6f69730f (patch) | |
| tree | 6fea30d737af863989cddb3304d4164d6f44c5df /Documentation | |
| parent | d0654dc308b0ba76dd8ed7bbb33c8d8f7aacd783 (diff) | |
| download | git-22a69fda197f78410190469bf0fcb51f6f69730f.zip git-22a69fda197f78410190469bf0fcb51f6f69730f.tar.gz git-22a69fda197f78410190469bf0fcb51f6f69730f.tar.bz2 | |
git-rebase.txt: update description of --allow-empty-message
Commit b00bf1c9a8dd ("git-rebase: make --allow-empty-message the
default", 2018-06-27) made --allow-empty-message the default and thus
turned --allow-empty-message into a no-op but did not update the
documentation to reflect this. Update the documentation now, and hide
the option from the normal -h output since it is not useful.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 0c4f038..c83be7f 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -265,9 +265,10 @@ See also INCOMPATIBLE OPTIONS below. See also INCOMPATIBLE OPTIONS below. --allow-empty-message:: - By default, rebasing commits with an empty message will fail. - This option overrides that behavior, allowing commits with empty - messages to be rebased. + No-op. Rebasing commits with an empty message used to fail + and this option would override that behavior, allowing commits + with empty messages to be rebased. Now commits with an empty + message do not cause rebasing to halt. + See also INCOMPATIBLE OPTIONS below. |