diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-27 11:43:46 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-27 11:43:46 +0100 |
| commit | 37818d7db070f67a20df58ac7d5e04cc63ef1867 (patch) | |
| tree | 1b1b2b71afab1c4ad29666f56fa8d2560b7855c6 /help.c | |
| parent | fetch-pack: Do not fetch tags for shallow clones. (diff) | |
| parent | count-objects -v: show number of packs as well. (diff) | |
| download | git-37818d7db070f67a20df58ac7d5e04cc63ef1867.tar.xz git-37818d7db070f67a20df58ac7d5e04cc63ef1867.zip | |
Merge branch 'master' into js/shallow
This is to adjust to:
count-objects -v: show number of packs as well.
which will break a test in this series.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'help.c')
| -rw-r--r-- | help.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -3,12 +3,11 @@ * * Builtin help-related commands (help, usage, version) */ -#include <sys/ioctl.h> #include "cache.h" #include "builtin.h" #include "exec_cmd.h" #include "common-cmds.h" - +#include <sys/ioctl.h> /* most GUI terminals set COLUMNS (although some don't export it) */ static int term_columns(void) |