diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-20 09:25:32 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-20 09:25:32 +0300 |
| commit | 06a054014b23494f5ace2699e2aaf7b35757e010 (patch) | |
| tree | dfdc4b24c13022084f8ff365730b7c04ae23ee37 /Documentation/git-log.txt | |
| parent | bcd5461a35c2cb876efc9eb9f66505336ecb192f (diff) | |
| parent | f98fd4367542b507c18b6aeb4ac0c824dec4b7b3 (diff) | |
Merge branch 'mg/rev-list-n-reverse-doc'
* mg/rev-list-n-reverse-doc:
git-log.txt,rev-list-options.txt: put option blocks in proper order
git-log.txt,rev-list-options.txt: -n/--max-count is commit limiting
Diffstat (limited to 'Documentation/git-log.txt')
| -rw-r--r-- | Documentation/git-log.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 7fb842334f..2c84028838 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -25,6 +25,7 @@ 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 @@ -72,16 +73,16 @@ produced by --stat etc. to be prefixed with "\-- " to separate them from options or refnames. +include::rev-list-options.txt[] + +include::pretty-formats.txt[] + Common diff options -~~~~~~~~~~~~~~~~~~~ +------------------- :git-log: 1 include::diff-options.txt[] -include::rev-list-options.txt[] - -include::pretty-formats.txt[] - include::diff-generate-patch.txt[] Examples |