Merge branch 'jc/dirwalk-n-cache-tree' into next

diff --git a/git.c b/git.c
index a5690e3ea89aa714701b70c918dc47844a73178f..a4ddac71cabffb45be19b9c7a31fc5cbb3da9683 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 },