diff options
| author | Emilio Cobos Álvarez <emilio@crisal.io> | 2019-02-14 00:44:33 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-14 20:54:27 +0100 |
| commit | b83ffbdac349b744b87b658d78b7e0b9b7b51954 (patch) | |
| tree | 61378dacaa1c523e3e5da8c17b4130058a370f8b /Documentation/git-rebase.txt | |
| parent | Git 2.20 (diff) | |
| download | git-b83ffbdac349b744b87b658d78b7e0b9b7b51954.tar.xz git-b83ffbdac349b744b87b658d78b7e0b9b7b51954.zip | |
docs/git-rebase: remove redundant entry in incompatible options list
The --autosquash option is implied by the earlier --[no-]autosquash
entry in the list.
Signed-off-by: Emilio Cobos Álvarez <emilio@crisal.io>
Reviewed-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 dff17b3178..186c5d0cf6 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -535,7 +535,6 @@ Flags only understood by the interactive backend: * --interactive * --exec * --keep-empty - * --autosquash * --edit-todo * --root when used in combination with --onto |