git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
To: git@vger.kernel.org
Subject: man pages oddity from git-fetch.txt
Date: Thu, 25 Jun 2009 19:18:20 +0200	[thread overview]
Message-ID: <20090625171819.GM19869@ins.uni-bonn.de> (raw)

Hello giters,

git-fetch.1 and git-pull.1 from the man branch bogusly display for me
like this:

       -a, --append
           Append ref names and object names of fetched refs to the existing contents of will
           be overwritten.

with man 2.5.1, GNU groff 1.18.1 (note the part about FETCH_HEAD is
missing).  This apparently changed in 5ca22945a:man1/git-fetch.1:

-Append ref names and object names of fetched refs to the existing contents of \.git/FETCH_HEAD\
+Append ref names and object names of fetched refs to the existing contents of
+\.git/FETCH_HEAD\. Without this option old data in
+\.git/FETCH_HEAD
+will be overwritten\.

induced by 93d69d86: Refactored merge options into separate merge-options.txt.

--- /dev/null
+++ b/Documentation/fetch-options.txt
@@ -0,0 +1,14 @@
+-a, \--append::
+       Append ref names and object names of fetched refs to the
+       existing contents of `.git/FETCH_HEAD`.  Without this
+       option old data in `.git/FETCH_HEAD` will be overwritten.

[...]
--a, \--append::
-       Append ref names and object names of fetched refs to the
-       existing contents of $GIT_DIR/FETCH_HEAD.  Without this
-       option old data in $GIT_DIR/FETCH_HEAD will be overwritten.


I have no idea whether my man/groff is broken, or your asciidoc program,
or the sources; although, the online copy seems to be ok:
<http://www.kernel.org/pub/software/scm/git/docs/git-fetch.html>.

Cheers, and thanks for maintaining git,
Ralf

                 reply	other threads:[~2009-06-25 17:45 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090625171819.GM19869@ins.uni-bonn.de \
    --to=ralf.wildenhues@gmx.de \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).