diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-11-12 15:26:02 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-11-13 12:04:00 +0900 |
| commit | 982288e9bda8ea8587b8afef63eb3424b047a018 (patch) | |
| tree | 9db774c2c1d7a0ab36cf7a445432061f17ee8c6f /t/t5100/sample.mboxrd | |
| parent | built-in rebase --skip/--abort: clean up stale .git/<name> files (diff) | |
| download | tgif-982288e9bda8ea8587b8afef63eb3424b047a018.tar.xz | |
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>
Diffstat (limited to 't/t5100/sample.mboxrd')
0 files changed, 0 insertions, 0 deletions