Merge branch 'jc/squash'

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 65aa939f6b2bafe5bf7c55bf38456eb28b4df0a3..7b954d587ec48314dee6c7d179e57607f958e875 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+GIT-CFLAGS
 GIT-VERSION-FILE
 git
 git-add