Merge branch 'master' into next

* master:
  Fix "git help -a" terminal autosizing
  diff-index: fix compilation warnings.

diff --combined git.c
index 619c665,01b7e28..b761150
--- 1/git.c
--- 2/git.c
+++ b/git.c
@@@ -8,7 -8,6 +8,6 @@@
  #include <errno.h>
  #include <limits.h>
  #include <stdarg.h>
- #include <sys/ioctl.h>
  #include "git-compat-util.h"
  #include "exec_cmd.h"
  
@@@ -47,7 -46,6 +46,7 @@@ static void handle_internal_command(in
                { "log", cmd_log },
                { "whatchanged", cmd_whatchanged },
                { "show", cmd_show },
 +              { "fmt-patch", cmd_format_patch },
        };
        int i;