Merge branch 'jc/diff' into next

* jc/diff:
builtin-diff: call it "git-diff", really.

diff --cc Makefile
Simple merge

diff --cc git.c
index 6d51add7d5d96be65e667b6d4eea9d607f1e2e67,e6a960a9657965a11c6ae2a1834262318146ab15..d5f0faa9077b0a769c8b36d47cc08cbf86b9d564
--- 1/git.c
--- 2/git.c
+++ b/git.c
@@@ -46,11 -46,7 +46,11 @@@ static void handle_internal_command(in
                { "log", cmd_log },
                { "whatchanged", cmd_whatchanged },
                { "show", cmd_show },
-               { "diffn", cmd_diff },
 +              { "fmt-patch", cmd_format_patch },
 +              { "count-objects", cmd_count_objects },
+               { "diff", cmd_diff },
 +              { "push", cmd_push },
 +              { "grep", cmd_grep },
        };
        int i;