git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* man pages oddity from git-fetch.txt
@ 2009-06-25 17:18 Ralf Wildenhues
  0 siblings, 0 replies; only message in thread
From: Ralf Wildenhues @ 2009-06-25 17:18 UTC (permalink / raw)
  To: git

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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2009-06-25 17:45 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-25 17:18 man pages oddity from git-fetch.txt Ralf Wildenhues

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