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@xxxxxxxxx> --- 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html