Merge branch 'jc/squash'

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index afd0876218686c14834ff27b3ad6f0da307da601..7b954d587ec48314dee6c7d179e57607f958e875 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+GIT-CFLAGS
 GIT-VERSION-FILE
 git
 git-add
@@ -17,7 +18,6 @@ git-cherry
 git-cherry-pick
 git-clean
 git-clone
-git-clone-pack
 git-commit
 git-commit-tree
 git-convert-objects