summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-09-19 00:58:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-09-19 00:58:00 (GMT)
commit4f4cb66b091c1d87cd42e8a7905b479f3560b28b (patch)
treec63cd06fa308a2c5a3a73f397681e4368ef1b16e /.gitignore
parente46544454a8f4a157bf6988b14fb6841b31ced88 (diff)
parent3821c3806879ac9b42fa98051ab96f1231c89e73 (diff)
downloadgit-4f4cb66b091c1d87cd42e8a7905b479f3560b28b.zip
git-4f4cb66b091c1d87cd42e8a7905b479f3560b28b.tar.gz
git-4f4cb66b091c1d87cd42e8a7905b479f3560b28b.tar.bz2
Merge branch 'pb/clang-json-compilation-database'
Developer support. * pb/clang-json-compilation-database: Makefile: add support for generating JSON compilation database
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 9673e79..d0f692a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -196,6 +196,7 @@
/git.spec
*.exe
*.[aos]
+*.o.json
*.py[co]
.depend/
*.gcda
@@ -217,6 +218,7 @@
/tags
/TAGS
/cscope*
+/compile_commands.json
*.hcc
*.obj
*.lib