Merge branch 'master' into next

* master: Fix "git help -a" terminal autosizing diff-index: fix compilation warnings.
2006-04-27 12:25:18 -07:00
parent 70b1fb23e2 e5de2c5e30
commit e431e4cd7d
3 changed files with 1 additions and 2 deletions
--- 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"