From: Junio C Hamano <junkio@cox.net>
Date: Thu, 27 Apr 2006 19:25:18 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.4.1-rc1~174
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e431e4cd7d4f496ceefc374c7c922d8ff1d910bd?ds=inline;hp=-c

Merge branch 'master' into next

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

e431e4cd7d4f496ceefc374c7c922d8ff1d910bd
diff --combined git.c
index 619c6654e4,01b7e28b8c..b761150c29
--- a/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;