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

Show 'CONFLICT' indicator at command prompt #1302

Closed
wants to merge 1 commit into from
Closed

Show 'CONFLICT' indicator at command prompt #1302

wants to merge 1 commit into from

Commits on Aug 16, 2022

  1. git-prompt: show presence of unresolved conflicts at command prompt 

    If GIT_PS1_SHOWCONFLICTSTATE is set to "yes", show the word "CONFLICT"
on the command prompt when there are unresolved conflicts.

Example prompt: (main|CONFLICT)

Signed-off-by: Justin Donnelly <justinrdonnelly@gmail.com>
    @justinrdonnelly
    justinrdonnelly committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    2ea5c40 View commit details
    Browse the repository at this point in the history