diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-12 22:46:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-12 22:46:22 -0700 |
| commit | fc721b699b817e9cb78994c6dd6d86e744bd2112 (patch) | |
| tree | 0025270b218499140b00d416e6ba804731023bc5 | |
| parent | c67a9e26822b66a524424afd1197e47bed3ac565 (diff) | |
| parent | 9612e74342cfd38c0b83230a2c847cd070599a5a (diff) | |
| download | git-fc721b699b817e9cb78994c6dd6d86e744bd2112.tar.gz git-fc721b699b817e9cb78994c6dd6d86e744bd2112.tar.xz | |
Merge branch 'maint'
* maint:
Do not talk about "diff" in rev-list documentation.
| -rw-r--r-- | Documentation/rev-list-options.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 0ce3f7fbd..735cf07b2 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -96,6 +96,7 @@ you would get an output like this: This implies the '--topo-order' option by default, but the '--date-order' option may also be specified. +ifndef::git-rev-list[] Diff Formatting ~~~~~~~~~~~~~~~ @@ -125,6 +126,7 @@ options may be given. See linkgit:git-diff-files[1] for more options. -t:: Show the tree objects in the diff output. This implies '-r'. +endif::git-rev-list[] Commit Limiting ~~~~~~~~~~~~~~~ |