aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-log.txt
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2011-03-08 09:31:26 +0100
committerJunio C Hamano <gitster@pobox.com>2011-03-09 15:15:52 -0800
commitf98fd4367542b507c18b6aeb4ac0c824dec4b7b3 (patch)
tree599a79fecb6c0017fcf0ac6435958f771aac38c8 /Documentation/git-log.txt
parent190767f6c15edef430498a10356cb6d573934e7a (diff)
downloadgit-f98fd4367542b507c18b6aeb4ac0c824dec4b7b3.tar.gz
git-f98fd4367542b507c18b6aeb4ac0c824dec4b7b3.tar.xz
git-log.txt,rev-list-options.txt: put option blocks in proper order
Match the order of the description to the one in which they get applied: commit limiting commit ordering commit formatting diff options Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-log.txt')
-rw-r--r--Documentation/git-log.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 48c171512..c43aa438c 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -73,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