Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

git-prompt: improve cherry-pick/revert detection #281

Closed
wants to merge 1 commit into from
Closed

git-prompt: improve cherry-pick/revert detection #281

wants to merge 1 commit into from

Commits on Jun 28, 2019

  1. 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>
    @phillipwood
    phillipwood committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    0f04fa2 View commit details
    Browse the repository at this point in the history