| commit | e981bf75251ecab712fa70ea2fe995a973ed5dba | |
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | |
| Mon, 1 Jul 2019 14:21:06 +0000 (1 07:21 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Jul 2019 19:39:44 +0000 (1 12:39 -0700) | ||
| tree | 075d190e229475bbb7a38a675382d18084a9a80b | treesnapshot (tar.gz zip) |
| parent | 8dca754b1e874719a732bc9ab7b0e14b21b1bc10 | commitdiff |
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 <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| contrib/completion/git-prompt.sh | diffblobblamehistory | |
| t/t9903-bash-prompt.sh | diffblobblamehistory |