From: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed, 01 Dec 2010 16:39:30 GMT
Subject: Re: [PATCH] git-commit.txt: (synopsis): move -i and -o before "--"
Message-ID: <20101201163930.GE26120@burratino>
In-Reply-To: <74d884bbd76bf090472b123f8053f095cda523f9.1291215072.git.jari.aalto@cante.net>

jari.aalto@cante.net wrote:

> From: Jari Aalto <jari.aalto@cante.net>

"The -i and -o options cannot be used after --, so do not get the reader's
hopes up by suggesting they can.

Reported-by: Joey Hess <joey@kitenet.net>"

> Signed-off-by: Jari Aalto <jari.aalto@cante.net>

Thanks.

[...]
> --- a/Documentation/git-commit.txt
> +++ b/Documentation/git-commit.txt
> @@ -11,8 +11,8 @@ SYNOPSIS
>  'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend] [--dry-run]
>  	   [(-c | -C) <commit>] [-F <file> | -m <msg>] [--reset-author]
>  	   [--allow-empty] [--allow-empty-message] [--no-verify] [-e] [--author=<author>]
> -	   [--date=<date>] [--cleanup=<mode>] [--status | --no-status] [--]
> -	   [[-i | -o ]<file>...]
> +	   [--date=<date>] [--cleanup=<mode>] [--status | --no-status]
> +	   [-i | -o ] [--] [<file>...]

While at it, shouldn't we get rid of the extra space after "-o"?