summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2008-12-27 15:21:03 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-12-27 14:30:46 -0800
commit57d43466fbb4ffb4106b97593a96d714137dde2a (patch)
tree48db4a289f4c442803a5f7ea43f6e1fdc0398548 /Documentation/merge-strategies.txt
parentgrep: support --no-ext-grep to test builtin grep (diff)
downloadtgif-57d43466fbb4ffb4106b97593a96d714137dde2a.tar.xz
grep: grep cache entries if they are "assume unchanged"
"Assume unchanged" bit means "please pretend that I have never touched this file", so if user removes the file, we should not care. This patch teaches "git grep" to use cache version in such situations. External grep case has not been fixed yet. But given that on the platform that CE_VALID bit may be used like Windows, external grep is not available anyway, I would wait for people to raise their hands before touching it. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions