Merge branch 'pb/clang-json-compilation-database'

[thirdparty/git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9673e792db80d75260cb08fd169488888492b6f1..d0f692a35520bcdf630aea7d882f4ae2fa666445 100644 (file)
--- 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