From: Junio C Hamano Date: Tue, 2 May 2006 06:09:15 +0000 (-0700) Subject: Merge branch 'jc/diff' into next X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=200f5dffc257f99f99597d1a8127e1d79ff3c176;p=git.git Merge branch 'jc/diff' into next * jc/diff: builtin-diff: call it "git-diff", really. --- 200f5dffc257f99f99597d1a8127e1d79ff3c176 diff --cc git.c index 6d51add7,e6a960a9..d5f0faa9 --- a/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 }, + { "fmt-patch", cmd_format_patch }, + { "count-objects", cmd_count_objects }, - { "diffn", cmd_diff }, + { "diff", cmd_diff }, + { "push", cmd_push }, + { "grep", cmd_grep }, }; int i;