]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'jd/prompt-show-conflict'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Aug 2022 21:55:12 +0000 (14:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Aug 2022 21:55:12 +0000 (14:55 -0700)
commita572a5d4c1a00f276b4b6ed4e86cdb3d9aed51dc
tree07d6910329ff0ea169a3ed606a17248159e5ede5
parentbc820cf9e6b529b07d95000f1ca60827b855182b
parente03acd0d4ad75115f454041fac3300ae796f108f
Merge branch 'jd/prompt-show-conflict'

The bash prompt (in contrib/) learned to optionally indicate when
the index is unmerged.

* jd/prompt-show-conflict:
  git-prompt: show presence of unresolved conflicts at command prompt