From: Junio C Hamano <redacted>
Date: Wed, 22 Apr 2020 20:43:00 +0000 (-0700)
Subject: Merge branch 'en/rebase-no-keep-empty'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=c7d8f69da5443788950b823bd6b9b663e1e686a3;p=git.git

Merge branch 'en/rebase-no-keep-empty'

"git rebase" (again) learns to honor "--no-keep-empty", which lets
the user to discard commits that are empty from the beginning (as
opposed to the ones that become empty because of rebasing).  The
interactive rebase also marks commits that are empty in the todo.

* en/rebase-no-keep-empty:
  rebase: fix an incompatible-options error message
  rebase: reinstate --no-keep-empty
  rebase -i: mark commits that begin empty in todo editor
---

c7d8f69da5443788950b823bd6b9b663e1e686a3