]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5aec927) | patch
status: rebase and merge can be in progress at the same time
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 12 Nov 2018 23:26:02 +0000 (15:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Nov 2018 03:04:00 +0000 (12:04 +0900)
commit982288e9bda8ea8587b8afef63eb3424b047a018
tree9db774c2c1d7a0ab36cf7a445432061f17ee8c6ftree | snapshot
parent5aec9271d343f117eb075a2b7038481f0d9f276fcommit | diff
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>
wt-status.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.