summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-04 06:54:34 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-04 06:54:34 (GMT)
commit230f544e877641666f8c3718ac4563294c2b305e (patch)
treeae2c574c6c8384b7b379aff52c035a7b953ff084 /git.c
parent6b16250a4551682b026b2592e44077ffa5fbdf2a (diff)
parent8ab99476ec2298a43e94949e0bb7aa5125793a28 (diff)
downloadgit-230f544e877641666f8c3718ac4563294c2b305e.zip
git-230f544e877641666f8c3718ac4563294c2b305e.tar.gz
git-230f544e877641666f8c3718ac4563294c2b305e.tar.bz2
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.
Diffstat (limited to 'git.c')
-rw-r--r--git.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/git.c b/git.c
index 4d3a5a3..49ba518 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;