diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-12 00:44:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-12 00:44:27 -0700 |
| commit | b24642b2f27b2cf01f6e726d816a2a1f5955ae3e (patch) | |
| tree | b889dd75b22f66350e7c3143a5a4b72ffcfac2e6 /blame.c | |
| parent | f789e347465dded7fcec3a605473fa3f549792d8 (diff) | |
| download | git-b24642b2f27b2cf01f6e726d816a2a1f5955ae3e.tar.gz git-b24642b2f27b2cf01f6e726d816a2a1f5955ae3e.tar.xz | |
blame: Document and add help text for -f, -n, and -p
New options --show-name, --show-number and --porcelain were not
documented. Also add -p as a short-hand for --porcelain for
consistency.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'blame.c')
| -rw-r--r-- | blame.c | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -22,11 +22,14 @@ #define DEBUG 0 static const char blame_usage[] = -"git-blame [-c] [-l] [-t] [-S <revs-file>] [--] file [commit]\n" +"git-blame [-c] [-l] [-t] [-f] [-n] [-p] [-S <revs-file>] [--] file [commit]\n" " -c, --compatibility Use the same output mode as git-annotate (Default: off)\n" " -l, --long Show long commit SHA1 (Default: off)\n" " -t, --time Show raw timestamp (Default: off)\n" -" -S, --revs-file Use revisions from revs-file instead of calling git-rev-list\n" +" -f, --show-name Show original filename (Default: auto)\n" +" -n, --show-number Show original linenumber (Default: off)\n" +" -p, --porcelain Show in a format designed for machine consumption\n" +" -S revs-file Use revisions from revs-file instead of calling git-rev-list\n" " -h, --help This message"; static struct commit **blame_lines; @@ -951,7 +954,8 @@ int main(int argc, const char **argv) show_number = 1; continue; } - if (!strcmp(argv[i], "--porcelain")) { + if (!strcmp(argv[i], "-p") || + !strcmp(argv[i], "--porcelain")) { porcelain = 1; sha1_len = 40; show_raw_time = 1; |