| commit | 982288e9bda8ea8587b8afef63eb3424b047a018 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Mon, 12 Nov 2018 23:26:02 +0000 (12 15:26 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 13 Nov 2018 03:04:00 +0000 (13 12:04 +0900) | ||
| tree | 9db774c2c1d7a0ab36cf7a445432061f17ee8c6f | treesnapshot (tar.gz zip) |
| parent | 5aec9271d343f117eb075a2b7038481f0d9f276f | commitdiff |
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| wt-status.c | diffblobblamehistory |