summaryrefslogtreecommitdiffstats
path: root/git-log.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-05-15 03:13:17 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-05-15 03:13:17 +0000
commit0430e3a874bf1f6935be905e8539d77d41f48a62 (patch)
treeabb023ef457cf5e0d2cc84e690c27ffcd1112a89 /git-log.txt
parent323e52dd2e49bceead5c67a881e8dc79db63e52c (diff)
downloadgit-htmldocs-0430e3a874bf1f6935be905e8539d77d41f48a62.tar.gz
Autogenerated HTML docs for v1.5.2-rc3-39-gaf9b
Diffstat (limited to 'git-log.txt')
-rw-r--r--git-log.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/git-log.txt b/git-log.txt
index dd06527a1..0f353f655 100644
--- a/git-log.txt
+++ b/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::