Re: pull-fetch-param.txt

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Junio C Hamano
Date: Friday, July 13, 2007 - 12:17 am

Gerrit Pape <pape@smarden.org> writes:


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

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH] escape tilde in Documentation/git-rev-parse.txt, Stefan Richter, (Mon Oct 2, 11:55 am)
Re: pull-fetch-param.txt, Junio C Hamano, (Tue Oct 3, 1:01 pm)
Re: pull-fetch-param.txt, Stuart Rackham, (Tue Oct 3, 3:38 pm)
Re: pull-fetch-param.txt, Junio C Hamano, (Tue Oct 3, 7:03 pm)
Re: pull-fetch-param.txt, Stefan Richter, (Wed Oct 4, 9:28 am)
Re: pull-fetch-param.txt, Stefan Richter, (Wed Oct 4, 10:15 am)
Re: asciidoc 7--8 compatibility, Stefan Richter, (Wed Oct 4, 3:22 pm)
Re: asciidoc 7--8 compatibility, Stuart Rackham, (Wed Oct 4, 4:40 pm)
Re: pull-fetch-param.txt, Junio C Hamano, (Thu Jul 12, 2:58 pm)
Re: pull-fetch-param.txt, Gerrit Pape, (Thu Jul 12, 10:53 pm)
Re: pull-fetch-param.txt, Junio C Hamano, (Fri Jul 13, 12:17 am)
Re: pull-fetch-param.txt, Gerrit Pape, (Fri Jul 13, 12:48 am)
Re: pull-fetch-param.txt, Gerrit Pape, (Fri Jul 20, 7:32 am)
Re: pull-fetch-param.txt, Junio C Hamano, (Fri Jul 20, 9:45 am)
Re: pull-fetch-param.txt, Julian Phillips, (Fri Jul 20, 10:09 am)
Re: pull-fetch-param.txt, Junio C Hamano, (Fri Jul 20, 11:01 am)