summaryrefslogtreecommitdiff
path: root/Documentation/git-annotate.txt
diff options
context:
space:
mode:
authorAndrew Ruder <andy@aeruder.net>2007-04-16 06:20:34 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-16 08:14:46 (GMT)
commit635f4a30f0f73fcd3ed29c8d70be334689cc4082 (patch)
treeb2e521a4f718112129da0fe85dc4ade724a7e621 /Documentation/git-annotate.txt
parent0b9a9dd00a4c08b09d5661942b31c7ee590626b7 (diff)
downloadgit-635f4a30f0f73fcd3ed29c8d70be334689cc4082.zip
git-635f4a30f0f73fcd3ed29c8d70be334689cc4082.tar.gz
git-635f4a30f0f73fcd3ed29c8d70be334689cc4082.tar.bz2
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 'Documentation/git-annotate.txt')
-rw-r--r--Documentation/git-annotate.txt15
1 files changed, 1 insertions, 14 deletions
diff --git a/Documentation/git-annotate.txt b/Documentation/git-annotate.txt
index 7baf731..02dc474 100644
--- a/Documentation/git-annotate.txt
+++ b/Documentation/git-annotate.txt
@@ -16,20 +16,7 @@ which introduced the line. Optionally annotate from a given revision.
OPTIONS
-------
--l, --long::
- Show long rev (Defaults off).
-
--t, --time::
- Show raw timestamp (Defaults off).
-
--r, --rename::
- Follow renames (Defaults on).
-
--S, --rev-file <revs-file>::
- Use revs from revs-file instead of calling git-rev-list.
-
--h, --help::
- Show help message.
+include::blame-options.txt[]
SEE ALSO
--------