Fix earlier mismerges.

diff --git a/git.c b/git.c
index a5690e3ea89aa714701b70c918dc47844a73178f..bc463c98eac42125c68a380614ec1779e5e81b93 100644 (file)
--- a/git.c
+++ b/git.c
@@ -47,7 +47,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "whatchanged", cmd_whatchanged },
                { "show", cmd_show },
                { "push", cmd_push },
-               { "fmt-patch", cmd_format_patch },
+               { "format-patch", cmd_format_patch },
                { "count-objects", cmd_count_objects },
                { "diff", cmd_diff },
                { "grep", cmd_grep },
@@ -57,7 +57,20 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "init-db", cmd_init_db },
                { "tar-tree", cmd_tar_tree },
                { "upload-tar", cmd_upload_tar },
-               { "check-ref-format", cmd_check_ref_format }
+               { "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 },
+               { "rev-parse", cmd_rev_parse }
        };
        int i;