Re: [PATCH 3/3] git-log.txt,rev-list-options.txt: put option blocks in proper order
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 9, 2011, 23:38 UTC
- Message-ID
- <7vbp1j985v.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <f34ebc6211ead3fa6698ff9b7a92903723715a28.1299572814.git.git@drmicha.warpmail.net>
Michael J Gruber <git@drmicha.warpmail.net> writes:
Show 17 quoted lines
> 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[]