| commit | 2d08f3deb9feb73dc8d21d75bfd367839fc1322c | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <gitster@pobox.com> | Thu Feb 14 14:28:22 2019 -0800 |
| committer | Junio C Hamano <gitster@pobox.com> | Thu Feb 14 14:28:22 2019 -0800 |
| tree | d090f9b19f8c4feac35b99e865cdb13e9ba4f376 | |
| 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
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 619303a..5629ba4 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt
@@ -529,7 +529,6 @@ * --interactive * --exec * --keep-empty - * --autosquash * --edit-todo * --root when used in combination with --onto