Re: [PATCH 3/3] git-log.txt,rev-list-options.txt: put option blocks in proper order

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx> writes:

> diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
> index 48c1715..6ae57dc 100644
> --- a/Documentation/git-log.txt
> +++ b/Documentation/git-log.txt
> @@ -77,12 +77,12 @@ Common diff options
>  ~~~~~~~~~~~~~~~~~~~
>  
>  :git-log: 1
> -include::diff-options.txt[]
> -
>  include::rev-list-options.txt[]
>  
>  include::pretty-formats.txt[]
>  
> +include::diff-options.txt[]
> +
>  include::diff-generate-patch.txt[]

This is wrong.  The title "Common diff options", telling the AsciiDoc that
we are formatting for git-log manual page with ":git-log: 1" and inclusion
of diff-options.txt form a single group.  With your patch, the "Common
diff options" section will become ampty and makes AsciiDoc barf.

You would need _at least_ something like the attached patch on top, which
for now I'll squash in.

 Documentation/git-log.txt |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 6ae57dc..c43aa43 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -73,14 +73,14 @@ produced by --stat etc.
 	to be prefixed with "\-- " to separate them from options or
 	refnames.
 
-Common diff options
-~~~~~~~~~~~~~~~~~~~
-
-:git-log: 1
 include::rev-list-options.txt[]
 
 include::pretty-formats.txt[]
 
+Common diff options
+-------------------
+
+:git-log: 1
 include::diff-options.txt[]
 
 include::diff-generate-patch.txt[]
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]