diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-27 12:25:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-27 12:25:18 -0700 |
| commit | e431e4cd7d4f496ceefc374c7c922d8ff1d910bd (patch) | |
| tree | d2c77e0b417b91f8d2e8d9608d881600019eb5a5 | |
| parent | Merge branch 'jc/cache-tree' into next (diff) | |
| parent | Merge branch 'pb/config' (diff) | |
| download | tgif-e431e4cd7d4f496ceefc374c7c922d8ff1d910bd.tar.xz | |
Merge branch 'master' into next
* master:
Fix "git help -a" terminal autosizing
diff-index: fix compilation warnings.
| -rw-r--r-- | builtin-help.c | 1 | ||||
| -rw-r--r-- | diff-index.c | 1 | ||||
| -rw-r--r-- | git.c | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/builtin-help.c b/builtin-help.c index 10a59cc403..7470faa566 100644 --- a/builtin-help.c +++ b/builtin-help.c @@ -3,6 +3,7 @@ * * Builtin help-related commands (help, usage, version) */ +#include <sys/ioctl.h> #include "cache.h" #include "builtin.h" #include "exec_cmd.h" diff --git a/diff-index.c b/diff-index.c index 86940123b3..8c9f60173b 100644 --- a/diff-index.c +++ b/diff-index.c @@ -11,7 +11,6 @@ COMMON_DIFF_OPTIONS_HELP; int main(int argc, const char **argv) { struct rev_info rev; - int match_missing = 0; int cached = 0; int i; @@ -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" |