Merge branch 'master' into js/fmt-patch

diff --git a/git.c b/git.c
index 49ba5189d923493aaed40a6a0fccc2ead040b06a..a8f7926b4875512b1d93768c1bc6d934111954f6 100644 (file)
--- a/git.c
+++ b/git.c
@@ -47,6 +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 },
                { "count-objects", cmd_count_objects },
                { "diff", cmd_diff },
        };