projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'jc/diff' into next
[git.git]
/
git.c
diff --git
a/git.c
b/git.c
index
619c665
..
d5f0faa
100644
(file)
--- a/
git.c
+++ b/
git.c
@@
-8,7
+8,6
@@
#include <errno.h>
#include <limits.h>
#include <stdarg.h>
#include <errno.h>
#include <limits.h>
#include <stdarg.h>
-#include <sys/ioctl.h>
#include "git-compat-util.h"
#include "exec_cmd.h"
#include "git-compat-util.h"
#include "exec_cmd.h"
@@
-48,6
+47,10
@@
static void handle_internal_command(int argc, const char **argv, char **envp)
{ "whatchanged", cmd_whatchanged },
{ "show", cmd_show },
{ "fmt-patch", cmd_format_patch },
{ "whatchanged", cmd_whatchanged },
{ "show", cmd_show },
{ "fmt-patch", cmd_format_patch },
+ { "count-objects", cmd_count_objects },
+ { "diff", cmd_diff },
+ { "push", cmd_push },
+ { "grep", cmd_grep },
};
int i;
};
int i;