aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-log.txt
diff options
context:
space:
mode:
authorJakub Narebski <jnareb@gmail.com>2007-05-14 01:25:45 +0200
committerJunio C Hamano <junkio@cox.net>2007-05-13 18:44:50 -0700
commit331b51d24050c221221049421a924c1a150887db (patch)
treed52edd2cc07ccef68cdab841a4043a4bf844911a /Documentation/git-log.txt
parent785cdea9befecc63b2b576c8042c5482fbf7bceb (diff)
downloadgit-331b51d24050c221221049421a924c1a150887db.tar.gz
git-331b51d24050c221221049421a924c1a150887db.tar.xz
Documentation: Split description of pretty formats of commit log
Split description of pretty formats into list of pretty options (--pretty and --encoding) in new file Documentation/pretty-options.txt and description of formats itself as a separate "PRETTY FORMATS" section in pretty-formats.txt While at it correct formatting a bit, to be better laid out in the resulting manpages: git-rev-list(1), git-show(1), git-log(1) and git-diff-tree(1). Those manpages now include pretty options in the same place as it was before, and description of formats just after all options. Inspired by the split into two filesdocumentation for merge strategies: Documentation/merge-options.txt and Documentation/merge-strategies.txt Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-log.txt')
-rw-r--r--Documentation/git-log.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index dd06527a1..0f353f655 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -25,7 +25,7 @@ This manual page describes only the most frequently used options.
OPTIONS
-------
-include::pretty-formats.txt[]
+include::pretty-options.txt[]
-<n>::
Limits the number of commits to show.
@@ -58,6 +58,9 @@ include::pretty-formats.txt[]
Show only commits that affect the specified paths.
+include::pretty-formats.txt[]
+
+
Examples
--------
git log --no-merges::