aboutsummaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-10-25 13:18:06 -0700
committerJunio C Hamano <junkio@cox.net>2006-10-25 13:18:06 -0700
commit8e95026f2942c2c485d9686736d861a6477480b5 (patch)
tree34fe30ed2981d79cae5791c85e8f0db183c602b8 /git.c
parent7756b1f1dc07fae9abab4126a687a2609dfbf009 (diff)
parent48fd688ab0ba7d41ff4286aee20f6f0b86e4c41c (diff)
downloadgit-8e95026f2942c2c485d9686736d861a6477480b5.tar.gz
git-8e95026f2942c2c485d9686736d861a6477480b5.tar.xz
Merge branch 'jc/web-blame'
* jc/web-blame: gitweb: spell "blame --porcelain" with -p blame: Document and add help text for -f, -n, and -p gitweb: blame porcelain: lineno and orig lineno swapped Remove git-annotate.perl and create a builtin-alias for git-blame gitweb: use blame --porcelain git-blame --porcelain blame.c: move code to output metainfo into a separate function. git-blame: --show-number (and -n) git-blame: --show-name (and -f) blame.c: whitespace and formatting clean-up. Gitweb - provide site headers and footers gitweb: blame: Mouse-over commit-8 shows author and date gitweb: blame: print commit-8 on the leading row of a commit-block Revert 954a6183756a073723a7c9fd8d2feb13132876b0 gitweb: prepare for repositories with packed refs. gitweb: make leftmost column of blame less cluttered.
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 e089b5357..235b6fea1 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 },