Re: pull-fetch-param.txt

From: Gerrit Pape <pape@smarden.org>
Date: Jul 13, 2007, 07:48 UTC
Message-ID: <20070713074824.9806.qmail@df2dc1a3890a6b.315fe32.mid.smarden.org>
In-Reply-To: <7vejjcpyb5.fsf@assigned-by-dhcp.cox.net>

On Fri, Jul 13, 2007 at 12:17:34AM -0700, Junio C Hamano wrote:

Show 9 quoted lines

> Gerrit Pape <pape@smarden.org> writes:
> >> Quick question.  Is the build done with "make
> >> ASCIIDOC8=YesPlease"?
> >
> > No, must have missed that.  This solves the first issue ...
> > ..., but not the second one with callout lists.
> 
> Sorry, does not reproduce for me, with asciidoc 8.2.1.  There
> must be something different between our environments.

Yes, I have docbook-xsl 1.72.0.

Show 24 quoted lines

> Here is an excerpt from what I get for git-reset.txt in
> git-reset.1:
> 
> -- >8 --
> .\"     Title: git\-reset
> .\"    Author: 
> .\" Generator: DocBook XSL Stylesheets v1.71.0 <http://docbook.sf.net/>
> .\"      Date: 07/13/2007
> .\"    Manual: Git Manual
> .\"    Source: Git 1.5.3.rc1.4.gaf83
> 
>     ...
> 
> .SH "EXAMPLES"
> .PP
> Undo a commit and redo
> .RS 3n
> .sp
> .RS 3n
> .nf
> $ git commit ...
> $ git reset \-\-soft HEAD^      \fB(1)\fR
> $ edit                        \fB(2)\fR
> $ git commit \-a \-c ORIG_HEAD  \fB(3)\fR

I get the same with docbook-xsl 1.71.0, but with 1.72.0:

.\" Title: git-reset .\" Author: .\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/> .\" Date: 07/13/2007 .\" Manual: Git Manual .\" Source: Git 1.5.3.rc0.104.g71f98 [...] .SH "EXAMPLES" .PP Undo a commit and redo .RS 4 .sp .RS 4 .nf $ git commit ... $ git reset \-\-soft HEAD^ \efB(1)\efR $ edit \efB(2)\efR $ git commit \-a \-c ORIG_HEAD \efB(3)\efR .fi .RE \&.sp \efB1. \efRThis is most often done when you remembered what you just committed is incomplete, or you misspelled your commit message, or both. Leaves working tree as it was before "reset".

\&.br \efB2. \efRmake corrections to working tree files.

\&.br \efB3. \efR"reset" copies the old head to .git/ORIG_HEAD; redo the commit by starting with its log message. If you do not need to edit the message further, you can give \-C option instead.

I'll check with the docbook-xsl Debian maintainer.

Thanks, Gerrit.