diff options
author | Junio C Hamano <junkio@cox.net> | 2006-10-25 13:18:06 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-10-25 13:18:06 -0700 |
commit | 8e95026f2942c2c485d9686736d861a6477480b5 (patch) | |
tree | 34fe30ed2981d79cae5791c85e8f0db183c602b8 /builtin.h | |
parent | 7756b1f1dc07fae9abab4126a687a2609dfbf009 (diff) | |
parent | 48fd688ab0ba7d41ff4286aee20f6f0b86e4c41c (diff) | |
download | git-8e95026f2942c2c485d9686736d861a6477480b5.tar.gz |
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 'builtin.h')
-rw-r--r-- | builtin.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -14,6 +14,7 @@ extern int write_tree(unsigned char *sha1, int missing_ok, const char *prefix); extern void prune_packed_objects(int); 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); |