git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jacob Helwig <jacob.helwig@gmail.com>
To: git@vger.kernel.org
Cc: Jacob Helwig <jacob.helwig@gmail.com>
Subject: [PATCH] Documentation: Fix indentation problem in git-commit(1)
Date: Sun, 14 Feb 2010 16:45:17 -0800	[thread overview]
Message-ID: <1266194717-25438-1-git-send-email-jacob.helwig@gmail.com> (raw)

All options listed after "-u[<mode>], --untracked-files[=<mode>]" in the
git-commit(1) manpage ended up listed as though they were part of the
description for -u/--untracked-files.  This was introduced by d6293d1.

Signed-off-by: Jacob Helwig <jacob.helwig@gmail.com>
---

Ever since the "See linkgit:git-config[1]..." paragraph was added to the
description for the --untracked-files option (d6293d1), the paragraphs
for the following options were indented at the same level as the "See
linkgit:git-config[1]" paragraph.  This problem looks like it only
showed up in the manpages, not in the HTML documentation.

I'm not entirely happy with this patch, since the "See linkgit..."
paragraph does not retain its previous indentation level in the
manpages, or HTML documentation.

Unfortunately, I'm not very good with ASCIIDOC at all, so this is mainly
the result of me throwing things at the problem until I found something
that (mostly) works.  Hopefully this will be enough to grab the
attention of someone that's better with ASCIIDOC than I.

 Documentation/git-commit.txt |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index e99bb14..64fb458 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -197,13 +197,13 @@ FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].)
 	Show untracked files (Default: 'all').
 +
 The mode parameter is optional, and is used to specify
-the handling of untracked files. The possible options are:
+the handling of untracked files.
++
+The possible options are:
 +
---
 	- 'no'     - Show no untracked files
 	- 'normal' - Shows untracked files and directories
 	- 'all'    - Also shows individual files in untracked directories.
---
 +
 See linkgit:git-config[1] for configuration variable
 used to change the default for when the option is not
-- 
1.7.0

             reply	other threads:[~2010-02-15  0:45 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-15  0:45 Jacob Helwig [this message]
2010-02-15  9:08 ` [PATCH] Documentation: Fix indentation problem in git-commit(1) Thomas Rast
2010-02-15 12:33   ` [PATCH v2] " Jacob Helwig
2010-02-19 17:54     ` Jacob Helwig
2010-02-20  5:28     ` Junio C Hamano

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=1266194717-25438-1-git-send-email-jacob.helwig@gmail.com \
    --to=jacob.helwig@gmail.com \
    --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).