summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-10-12 00:46:06 -0700
committerJunio C Hamano <junkio@cox.net>2006-10-12 00:46:06 -0700
commit66d0ff1bd35530f84c2b73e2b0e367637805217a (patch)
tree6a32fc84dffe46a587b12e3d3b69436f5ede8a72 /git.c
parentd15c55aa052434aee75c73da4ed771af3e3b6f61 (diff)
parentb24642b2f27b2cf01f6e726d816a2a1f5955ae3e (diff)
downloadgit-66d0ff1bd35530f84c2b73e2b0e367637805217a.tar.gz
Merge branch 'jc/blame' into jc/web-blame
* jc/blame: blame: Document and add help text for -f, -n, and -p Remove git-annotate.perl and create a builtin-alias for git-blame
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 b8e8622afb..32c356e044 100644
--- a/git.c
+++ b/git.c
@@ -219,6 +219,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
int option;
} commands[] = {
{ "add", cmd_add, RUN_SETUP },
+ { "annotate", cmd_annotate, },
{ "apply", cmd_apply },
{ "archive", cmd_archive },
{ "cat-file", cmd_cat_file, RUN_SETUP },