Justin Donnelly e03acd0d4a 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>		2022-08-19 10:58:40 -07:00
..
.gitattributes	completion: mark bash script as LF-only	2017-05-10 13:32:51 +09:00
git-completion.bash	completion: tab completion of filenames for 'git restore'	2022-03-15 17:21:22 -07:00
git-completion.tcsh	completion: tcsh: Fix regression by drop of wrapper functions	2021-08-18 13:58:27 -07:00
git-completion.zsh	contrib/completion: fix zsh completion regression from 59d85a2a05	2021-06-02 12:49:40 +09:00
git-prompt.sh	git-prompt: show presence of unresolved conflicts at command prompt	2022-08-19 10:58:40 -07:00