From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 18 Feb 2021 01:21:41 +0000 (-0800)
Subject: Merge branch 'mt/grep-cached-untracked'
X-Git-Tag: v2.31.0-rc0~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f712632a518ffd2611ae4a33cce43b53c73ce2c1;p=thirdparty%2Fgit.git

Merge branch 'mt/grep-cached-untracked'

"git grep --untracked" is meant to be "let's ALSO find in these
files on the filesystem" when looking for matches in the working
tree files, and does not make any sense if the primary search is
done against the index, or the tree objects.  The "--cached" and
"--untracked" options have been marked as mutually incompatible.

* mt/grep-cached-untracked:
  grep: error out if --untracked is used with --cached
---

f712632a518ffd2611ae4a33cce43b53c73ce2c1