summaryrefslogtreecommitdiff
path: root/t/t5324-split-commit-graph.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-02-17 17:21:41 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-02-17 17:21:41 -0800
commitf712632a518ffd2611ae4a33cce43b53c73ce2c1 (patch)
treea7d5a439805e9b6ea99eb6be665d6e9056cc2711 /t/t5324-split-commit-graph.sh
parentMerge branch 'sh/mergetool-hideresolved' (diff)
parentgrep: error out if --untracked is used with --cached (diff)
downloadtgif-f712632a518ffd2611ae4a33cce43b53c73ce2c1.tar.xz
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
Diffstat (limited to 't/t5324-split-commit-graph.sh')
0 files changed, 0 insertions, 0 deletions