]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ds/add-i-color-configuration-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Jun 2023 23:29:06 +0000 (16:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Jun 2023 23:29:06 +0000 (16:29 -0700)
The reimplemented "git add -i" did not honor color.ui configuration.

* ds/add-i-color-configuration-fix:
  add: test use of brackets when color is disabled
  add: check color.ui for interactive add

1  2 
builtin/add.c
t/t3701-add-interactive.sh

diff --cc builtin/add.c
Simple merge
Simple merge