git commit synopsis typo?

git commit synopsis typo?

[Joey Hess]

[-- Attachment #1: Type: text/plain, Size: 472 bytes --]

Shouldn't the -i and -o options be listed before the -- option?

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

-- 
see shy jo

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

Re: git commit synopsis typo?

[Junio C Hamano]

Joey Hess <joey@kitenet.net> writes:

> Shouldn't the -i and -o options be listed before the -- option?
>
>        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>...]

Yes, please make it so ;-)

Thanks.

[PATCH] git-commit.txt: (synopsis): move -i and -o before "--"

[jari.aalto]

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


Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
 Documentation/git-commit.txt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 42fb1f5..46ddc80 100644
--- 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>...]
 
 DESCRIPTION
 -----------
-- 
1.7.2.3

Re: [PATCH] git-commit.txt: (synopsis): move -i and -o before "--"

[Jonathan Nieder]

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"?

Re: [PATCH] git-commit.txt: (synopsis): move -i and -o before "--"

[Junio C Hamano]

Jonathan Nieder <jrnieder@gmail.com> writes:

> 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>"
> ...
> While at it, shouldn't we get rid of the extra space after "-o"?

Will do all of these at my end.

Thanks for an excellent coach to other contributors, as always.