git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8dca754)
git-prompt: improve cherry-pick/revert detection
authorPhillip Wood <redacted>
Mon, 1 Jul 2019 14:21:06 +0000 (07:21 -0700)
committerJunio C Hamano <redacted>
Mon, 1 Jul 2019 19:39:44 +0000 (12:39 -0700)
commite981bf75251ecab712fa70ea2fe995a973ed5dba
tree075d190e229475bbb7a38a675382d18084a9a80btree | snapshot
parent8dca754b1e874719a732bc9ab7b0e14b21b1bc10commit | diff
git-prompt: improve cherry-pick/revert detection

If the user commits or resets a conflict resolution in the middle of a
sequence of cherry-picks or reverts then CHERRY_PICK_HEAD/REVERT_HEAD
will be removed and so in the absence of those files we need to check
.git/sequencer/todo to see if there is a cherry-pick or revert in
progress.

Signed-off-by: Phillip Wood <redacted>
Signed-off-by: Junio C Hamano <redacted>
contrib/completion/git-prompt.sh diff | blob | history
t/t9903-bash-prompt.sh diff | blob | history
git clone https://git.99rst.org/PROJECT