Merge branch 'jc/fsck' into next

diff --git a/.gitignore b/.gitignore
index 5be239a4aa95f78cb09e4921459e1678b9f3c36e..8e94cbde6723d20ed14a018b6e3c5e2308306be5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -121,6 +121,7 @@ git-write-tree
 git-core-*/?*
 test-date
 test-delta
+common-cmds.h
 *.tar.gz
 *.dsc
 *.deb
@@ -130,3 +131,4 @@ libgit.a
 *.o
 *.py[co]
 config.mak
+git-blame