diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-05 15:04:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-05 15:04:01 -0800 |
| commit | 06e75a72372d0466e110002a7504fefebe0e9c52 (patch) | |
| tree | fd925c8cc6ab2c4cde1f4746e013a3f9725fed18 | |
| parent | 005f85d9ae95c44d8c6ecf61364642fbcaf49dd2 (diff) | |
| download | git-06e75a72372d0466e110002a7504fefebe0e9c52.tar.gz git-06e75a72372d0466e110002a7504fefebe0e9c52.tar.xz | |
blame: document --contents option
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/git-blame.txt | 9 | ||||
| -rw-r--r-- | builtin-blame.c | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt index 0ee887d73..5c9888d01 100644 --- a/Documentation/git-blame.txt +++ b/Documentation/git-blame.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git-blame' [-c] [-l] [-t] [-f] [-n] [-p] [--incremental] [-L n,m] [-S <revs-file>] - [-M] [-C] [-C] [--since=<date>] [<rev>] [--] <file> + [-M] [-C] [-C] [--since=<date>] [<rev> | --contents <file>] [--] <file> DESCRIPTION ----------- @@ -67,6 +67,13 @@ OPTIONS Show the result incrementally in a format designed for machine consumption. +--contents <file>:: + When <rev> is not specified, the command annotates the + changes starting backwards from the working tree copy. + This flag makes the command pretend as if the working + tree copy has the contents of he named file (specify + `-` to make the command read from the standard input). + -M:: Detect moving lines in the file as well. When a commit moves a block of lines in a file (e.g. the original file diff --git a/builtin-blame.c b/builtin-blame.c index fb30c4928..a18ef81a1 100644 --- a/builtin-blame.c +++ b/builtin-blame.c @@ -18,7 +18,7 @@ #include "cache-tree.h" static char blame_usage[] = -"git-blame [-c] [-l] [-t] [-f] [-n] [-p] [-L n,m] [-S <revs-file>] [-M] [-C] [-C] [--contents <filename>] [commit] [--] file\n" +"git-blame [-c] [-l] [-t] [-f] [-n] [-p] [-L n,m] [-S <revs-file>] [-M] [-C] [-C] [--contents <filename>] [--incremental] [commit] [--] file\n" " -c, --compatibility Use the same output mode as git-annotate (Default: off)\n" " -b Show blank SHA-1 for boundary commits (Default: off)\n" " -l, --long Show long commit SHA1 (Default: off)\n" |