Re: pull-fetch-param.txt

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 13, 2007, 07:17 UTC
Message-ID: <7vejjcpyb5.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20070713055346.634.qmail@1e54e4f4e1041d.315fe32.mid.smarden.org>

Gerrit Pape <pape@smarden.org> writes:

Show 5 quoted lines

>> 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.

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 .fi .RE .sp \fB1. \fRThis 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 \fB2. \fRmake corrections to working tree files. .br \fB3. \fR"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.

See also the \-\-amend option to \fBgit\-commit\fR(1). .br .RE -- 8< --

and "man -l git-reset.1" seems to show the callouts just fine.

-- >8 --
 ...
EXAMPLES
       Undo a commit and redo

             $ git commit ...
             $ git reset --soft HEAD^      (1)
             $ edit                        (2)
             $ git commit -a -c ORIG_HEAD  (3)

          1. This 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".
          2. make corrections to working tree files.
          3. "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.

          See also the --amend option to git-commit(1).
-- 8< --