Merge branch 'lt/push' into next

diff --git a/git.c b/git.c
index 6d51add7d5d96be65e667b6d4eea9d607f1e2e67..d5f0faa9077b0a769c8b36d47cc08cbf86b9d564 100644 (file)
--- a/git.c
+++ b/git.c
@@ -48,7 +48,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "show", cmd_show },
                { "fmt-patch", cmd_format_patch },
                { "count-objects", cmd_count_objects },
-               { "diffn", cmd_diff },
+               { "diff", cmd_diff },
                { "push", cmd_push },
                { "grep", cmd_grep },
        };