From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Dec 2021 17:39:53 +0000 (-0800)
Subject: Merge branch 're/color-default-reset'
X-Git-Tag: v2.35.0-rc0~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15209c86126a00e8e26ced788019edabf100abaa;p=thirdparty%2Fgit.git

Merge branch 're/color-default-reset'

"default" and "reset" colors have been added to our palette.

* re/color-default-reset:
  color: allow colors to be prefixed with "reset"
  color: support "default" to restore fg/bg color
  color: add missing GIT_COLOR_* white/black constants
---

15209c86126a00e8e26ced788019edabf100abaa