summaryrefslogtreecommitdiff
path: root/Documentation/git-log.txt
diff options
context:
space:
mode:
authorChris Riddoch <chris@syntacticsugar.org>2006-11-21 16:49:15 -0700
committerJunio C Hamano <junkio@cox.net>2006-11-22 16:06:32 -0800
commit5d1faf8791fa85ba9be2282900d4f704c7790648 (patch)
tree2e09cb0097e66268095b98ca40bb59cbca8fa3e1 /Documentation/git-log.txt
parent594270635732d6320d6e6d7fa127679ae90ef5b1 (diff)
downloadgit-5d1faf8791fa85ba9be2282900d4f704c7790648.tar.gz
Move --pretty options into Documentation/pretty-formats.txt
Asciidoc-include it into the manuals for programs that use the --pretty command-line option, for consistency among the docs. This describes all the pretty-formats currently listed in the cmit_fmt enum in commit.h, and also briefly describes the presence and format of the 'Merge: ' line in some pretty formats. There's a hedge that limiting your view of history can affect what goes in the Merge: line, and that --abbrev/--no-abbrev do nothing to the 'raw' format. Signed-off-by: Chris Riddoch <chris@syntacticsugar.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-log.txt')
-rw-r--r--Documentation/git-log.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index c9ffff734c..79643ac928 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -24,8 +24,8 @@ This manual page describes only the most frequently used options.
OPTIONS
-------
---pretty=<format>::
- Controls the way the commit log is formatted.
+
+include::pretty-formats.txt[]
--max-count=<n>::
Limits the number of commits to show.