diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-15 01:28:22 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-15 01:28:22 +0300 |
| commit | 2d08f3deb9feb73dc8d21d75bfd367839fc1322c (patch) | |
| tree | d090f9b19f8c4feac35b99e865cdb13e9ba4f376 /Documentation | |
| parent | 4e09a7b54009b6a2038438ee9c5d91102702257d (diff) | |
| parent | b83ffbdac349b744b87b658d78b7e0b9b7b51954 (diff) | |
Merge branch 'ea/rebase-compat-doc-fix'
* ea/rebase-compat-doc-fix:
docs/git-rebase: remove redundant entry in incompatible options list
Diffstat (limited to 'Documentation')
| -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 619303adbc..5629ba4c5d 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -529,7 +529,6 @@ are incompatible with the following options: * --interactive * --exec * --keep-empty - * --autosquash * --edit-todo * --root when used in combination with --onto |