summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-04-27 12:25:18 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-04-27 12:25:18 -0700
commite431e4cd7d4f496ceefc374c7c922d8ff1d910bd (patch)
treed2c77e0b417b91f8d2e8d9608d881600019eb5a5 /git.c
parentMerge branch 'jc/cache-tree' into next (diff)
parentMerge branch 'pb/config' (diff)
downloadtgif-e431e4cd7d4f496ceefc374c7c922d8ff1d910bd.tar.xz
Merge branch 'master' into next
* master: Fix "git help -a" terminal autosizing diff-index: fix compilation warnings.
Diffstat (limited to 'git.c')
-rw-r--r--git.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/git.c b/git.c
index 619c6654e4..b761150c29 100644
--- 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"