summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-20 15:54:43 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-20 15:54:43 -0700
commit9fcacaab021ae3835fa21bdf8c1fa9b2ca153a3a (patch)
tree660b5af1ccd8a036aa71846d2d6935df4ed65c65
parentf9c2d2b14e81d48d3d04f3bb01b1579ee359edb4 (diff)
parent70c2a258c60583e2650a3a236c532149712c0d14 (diff)
downloadgit-9fcacaab021ae3835fa21bdf8c1fa9b2ca153a3a.tar.gz
Merge branch 'nd/log-n-doc' into maint
* nd/log-n-doc: doc: move rev-list option -<n> from git-log.txt to rev-list-options.txt
-rw-r--r--Documentation/git-log.txt6
-rw-r--r--Documentation/rev-list-options.txt3
2 files changed, 4 insertions, 5 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 1f906208f9..585dac40ba 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -24,10 +24,6 @@ each commit introduces are shown.
OPTIONS
-------
--<n>::
- Limits the number of commits to show.
- Note that this is a commit limiting option, see below.
-
<since>..<until>::
Show only commits between the named two commits. When
either <since> or <until> is omitted, it defaults to
@@ -137,6 +133,8 @@ Examples
This makes sense only when following a strict policy of merging all
topic branches when staying on a single integration branch.
+`git log -3`::
+ Limits the number of commits to show to 3.
Discussion
----------
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 5436eba6e7..918c1109f2 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -8,7 +8,8 @@ ordering and formatting options, such as '--reverse'.
--
--n 'number'::
+-<number>::
+-n <number>::
--max-count=<number>::
Limit the number of commits to output.