tree d090f9b19f8c4feac35b99e865cdb13e9ba4f376
parent 4e09a7b54009b6a2038438ee9c5d91102702257d
parent b83ffbdac349b744b87b658d78b7e0b9b7b51954
author Junio C Hamano <gitster@pobox.com> 1550183302 -0800
committer Junio C Hamano <gitster@pobox.com> 1550183302 -0800

Merge branch 'ea/rebase-compat-doc-fix'

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