Merge branch 'ea/rebase-compat-doc-fix'
commit2d08f3deb9feb73dc8d21d75bfd367839fc1322c
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2019 22:28:22 +0000 (14 14:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2019 22:28:22 +0000 (14 14:28 -0800)
treed090f9b19f8c4feac35b99e865cdb13e9ba4f376
parent4e09a7b54009b6a2038438ee9c5d91102702257d
parentb83ffbdac349b744b87b658d78b7e0b9b7b51954
Merge branch 'ea/rebase-compat-doc-fix'

* ea/rebase-compat-doc-fix:
  docs/git-rebase: remove redundant entry in incompatible options list
Documentation/git-rebase.txt