Merge with git://kernel.org/pub/scm/git/git.git

diff --git a/git.c b/git.c
index aa2b814d9340839e587e39f45a2751c7eb0e1499..01b7e28b8c459c677a340f195a969a67a6d21792 100644 (file)
--- a/git.c
+++ b/git.c
@@ -8,7 +8,6 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>
-#include <sys/ioctl.h>
 #include "git-compat-util.h"
 #include "exec_cmd.h"