]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 795ea87) | patch
git-prompt: show presence of unresolved conflicts at command prompt
authorJustin Donnelly <justinrdonnelly@gmail.com>
Wed, 17 Aug 2022 00:18:12 +0000 (00:18 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Aug 2022 17:58:40 +0000 (10:58 -0700)
commite03acd0d4ad75115f454041fac3300ae796f108f
tree7ef09758c5d933c967f776a10d6ba8014d229963tree | snapshot
parent795ea8776befc95ea2becd8020c7a284677b4161commit | diff
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>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/completion/git-prompt.sh diff | blob | blame | history
t/t9903-bash-prompt.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.