Johannes Schindelin f2abea2e1d status: rebase and merge can be in progress at the same time ...

Since `git rebase -r` was introduced, that is possible. But our
machinery did not think that possible, and failed to say anything about
the rebase in progress when in the middle of a merge.

Let's work around that in the minimal fashion.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

2018-11-19 17:41:31 +01:00

66 KiB

Raw Blame History

View Raw