summaryrefslogtreecommitdiff
path: root/Documentation/git-log.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-04-28 16:57:32 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-04-28 16:57:32 -0700
commit89719209f48fe7d9694710795b1ec1d5fd7ebfc0 (patch)
tree4c264196192c6aa0b3a60d337f43ec082add3293 /Documentation/git-log.txt
parentMerge branch 'fix' (diff)
parentFix trivial typo in git-log man page. (diff)
downloadtgif-89719209f48fe7d9694710795b1ec1d5fd7ebfc0.tar.xz
Merge branch 'fix'
* fix: Fix trivial typo in git-log man page. Properly render asciidoc "callouts" in git man pages. Fix up remaining man pages that use asciidoc "callouts". Update the git-branch man page to include the "-r" option, annotate: display usage information if no filename was given annotate: fix warning about uninitialized scalar git-am --resolved: more usable error message.
Diffstat (limited to 'Documentation/git-log.txt')
-rw-r--r--Documentation/git-log.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 76cb894caa..af378ffcf9 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -14,13 +14,12 @@ DESCRIPTION
-----------
Shows the commit logs.
-The command takes options applicable to the gitlink::git-rev-list[1]
+The command takes options applicable to the gitlink:git-rev-list[1]
command to control what is shown and how, and options applicable to
-the gitlink::git-diff-tree[1] commands to control how the change
+the gitlink:git-diff-tree[1] commands to control how the change
each commit introduces are shown.
-This manual page describes only the most frequently used
-options.
+This manual page describes only the most frequently used options.
OPTIONS