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.
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
git-prompt: improve cherry-pick/revert detection #281
Conversation
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>
/submit |
Submitted as pull.281.git.gitgitgadget@gmail.com |
This branch is now known as |
This patch series was integrated into pu via git@24d457f. |
This patch series was integrated into pu via git@914133f. |
This patch series was integrated into pu via git@3f3eba9. |
This patch series was integrated into pu via git@808b3f2. |
This patch series was integrated into pu via git@4b3c0a7. |
This patch series was integrated into pu via git@f852cd6. |
This patch series was integrated into next via git@bf8f0af. |
This patch series was integrated into pu via git@e727a4c. |
This patch series was integrated into pu via git@8a4acc5. |
This patch series was integrated into next via git@8a4acc5. |
This patch series was integrated into master via git@8a4acc5. |
Closed via 8a4acc5. |
Fix the detection of in-progress cherry-picks and reverts when the user commits or resets a conflict resolution in the middle of a sequence of picks/reverts.