]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc820cf e03acd0)
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)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.