Merge branch 'jc/diff' into next

diff --git a/git.c b/git.c
index 619c6654e45d0208adefc6aecf723c5c25fd4a7b..a6ec3bcbe52b3f245f8304003eb1af39debec98f 100644 (file)
--- 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"
 
@@ -48,6 +47,8 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "whatchanged", cmd_whatchanged },
                { "show", cmd_show },
                { "fmt-patch", cmd_format_patch },
+               { "count-objects", cmd_count_objects },
+               { "diffn", cmd_diff },
        };
        int i;