summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-02-14 14:28:22 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-02-14 14:28:22 -0800
commit2d08f3deb9feb73dc8d21d75bfd367839fc1322c (patch)
treed090f9b19f8c4feac35b99e865cdb13e9ba4f376 /Documentation
parentMerge branch 'jc/no-grepping-for-strerror-in-tests' (diff)
parentdocs/git-rebase: remove redundant entry in incompatible options list (diff)
downloadtgif-2d08f3deb9feb73dc8d21d75bfd367839fc1322c.tar.xz
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.txt1
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