Merge branch 'master' into lt/apply

diff --git a/git.c b/git.c
index 619c6654e45d0208adefc6aecf723c5c25fd4a7b..10ea934bcf3271797e7087e909978d1b4d3a0ea5 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"
 
@@ -47,7 +46,30 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "log", cmd_log },
                { "whatchanged", cmd_whatchanged },
                { "show", cmd_show },
-               { "fmt-patch", cmd_format_patch },
+               { "push", cmd_push },
+               { "format-patch", cmd_format_patch },
+               { "count-objects", cmd_count_objects },
+               { "diff", cmd_diff },
+               { "grep", cmd_grep },
+               { "rm", cmd_rm },
+               { "add", cmd_add },
+               { "rev-list", cmd_rev_list },
+               { "init-db", cmd_init_db },
+               { "tar-tree", cmd_tar_tree },
+               { "upload-tar", cmd_upload_tar },
+               { "check-ref-format", cmd_check_ref_format },
+               { "ls-files", cmd_ls_files },
+               { "ls-tree", cmd_ls_tree },
+               { "tar-tree", cmd_tar_tree },
+               { "read-tree", cmd_read_tree },
+               { "commit-tree", cmd_commit_tree },
+               { "apply", cmd_apply },
+               { "show-branch", cmd_show_branch },
+               { "diff-files", cmd_diff_files },
+               { "diff-index", cmd_diff_index },
+               { "diff-stages", cmd_diff_stages },
+               { "diff-tree", cmd_diff_tree },
+               { "cat-file", cmd_cat_file }
        };
        int i;