Merge branch 'jc/diff'

* jc/diff:
  builtin-diff: call it "git-diff", really.
  builtin-diff.c: die() formatting type fix.
  built-in diff: assorted updates.
  built-in diff.

1 files changed, 1 insertions, 0 deletions

diff --git a/git.c b/git.c
index 4d3a5a30aa..49ba5189d9 100644
--- a/git.c
+++ b/git.c
@@ -48,6 +48,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
 		{ "show", cmd_show },
 		{ "push", cmd_push },
 		{ "count-objects", cmd_count_objects },
+		{ "diff", cmd_diff },
 	};
 	int i;