Merge branch 'ea/rebase-compat-doc-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2019 22:28:22 +0000 (14:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2019 22:28:22 +0000 (14:28 -0800)
* ea/rebase-compat-doc-fix:
docs/git-rebase: remove redundant entry in incompatible options list

1  2 
Documentation/git-rebase.txt
Simple merge