diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-07-01 07:21:06 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-07-01 12:39:44 -0700 |
| commit | e981bf75251ecab712fa70ea2fe995a973ed5dba (patch) | |
| tree | 075d190e229475bbb7a38a675382d18084a9a80b /t/t7110-reset-merge.sh | |
| parent | The third batch (diff) | |
| download | tgif-e981bf75251ecab712fa70ea2fe995a973ed5dba.tar.xz | |
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>
Diffstat (limited to 't/t7110-reset-merge.sh')
0 files changed, 0 insertions, 0 deletions