summaryrefslogtreecommitdiff
path: root/builtin.h
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 /builtin.h
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 'builtin.h')
-rw-r--r--builtin.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin.h b/builtin.h
index f9fa9ff1d2..2c5d900acc 100644
--- a/builtin.h
+++ b/builtin.h
@@ -13,6 +13,7 @@ extern void stripspace(FILE *in, FILE *out);
extern int write_tree(unsigned char *sha1, int missing_ok, const char *prefix);
extern int cmd_add(int argc, const char **argv, const char *prefix);
+extern int cmd_annotate(int argc, const char **argv, const char *prefix);
extern int cmd_apply(int argc, const char **argv, const char *prefix);
extern int cmd_archive(int argc, const char **argv, const char *prefix);
extern int cmd_cat_file(int argc, const char **argv, const char *prefix);