diff options
| author | Andrew Ruder <andy@aeruder.net> | 2007-04-16 01:20:34 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-16 01:14:46 -0700 |
| commit | 635f4a30f0f73fcd3ed29c8d70be334689cc4082 (patch) | |
| tree | b2e521a4f718112129da0fe85dc4ade724a7e621 /builtin-blame.c | |
| parent | 0b9a9dd00a4c08b09d5661942b31c7ee590626b7 (diff) | |
| download | git-635f4a30f0f73fcd3ed29c8d70be334689cc4082.tar.gz | |
Update git-annotate/git-blame documentation
Moved options that pertained to both git-blame and git-annotate to a
common file blame-options.txt.
builtin-blame.c: Removed --compatibility, --long, --time from the
short usage as they are not handled in the code.
Documentation/git-blame.txt: Removed common options to git-annotate.
Added documentation for --score-debug. Removed --compatibility.
Adjusted usage at top to not wrap on 80 columns.
Documentation/git-annotate.txt: Using common options blame-options.txt.
Documentation/blame-options.txt: Added -b note about associated config
option, added --root note about associated config option, added
documentation for --show-stats. Removed --long, --time, --rev-file as
those options do not really exist. Added documentation for -M/-C taking
an optional score argument for detection of moved lines.
Signed-off-by: Andrew Ruder <andy@aeruder.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-blame.c')
| -rw-r--r-- | builtin-blame.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-blame.c b/builtin-blame.c index bc86bda6c4..8919b028e6 100644 --- a/builtin-blame.c +++ b/builtin-blame.c @@ -19,11 +19,11 @@ static char blame_usage[] = "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" +" -c 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" +" -l Show long commit SHA1 (Default: off)\n" " --root Do not treat root commits as boundaries (Default: off)\n" -" -t, --time Show raw timestamp (Default: off)\n" +" -t Show raw timestamp (Default: off)\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" |