public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: "Jean-Noël Avila via GitGitGadget" <gitgitgadget@gmail•com>
To: git@vger•kernel.org
Cc: "Patrick Steinhardt" <ps@pks•im>,
	"Jean-Noël Avila" <jn.avila@free•fr>,
	"Jean-Noël Avila" <jn.avila@free•fr>
Subject: [PATCH v2 2/5] doc: the mode param of -u of git commit is optional
Date: Wed, 15 Jan 2025 20:23:45 +0000	[thread overview]
Message-ID: <d58526a9b39571dc2dd2703f62082d20b7a82446.1736972628.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1845.v2.git.1736972628.gitgitgadget@gmail.com>

From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free•fr>

Fix the synopsis to reflect the option description.

Signed-off-by: Jean-Noël Avila <jn.avila@free•fr>
---
 Documentation/git-commit.txt | 2 +-
 builtin/commit.c             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index e37c4a4987e..f5d702205d2 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -8,7 +8,7 @@ git-commit - Record changes to the repository
 SYNOPSIS
 --------
 [synopsis]
-git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]
+git commit [-a | --interactive | --patch] [-s] [-v] [-u[<mode>]] [--amend]
 	   [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>]
 	   [-F <file> | -m <msg>] [--reset-author] [--allow-empty]
 	   [--allow-empty-message] [--no-verify] [-e] [--author=<author>]
diff --git a/builtin/commit.c b/builtin/commit.c
index ef5e622c077..a7315ed67cc 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -44,7 +44,7 @@
 #include "trailer.h"
 
 static const char * const builtin_commit_usage[] = {
-	N_("git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n"
+	N_("git commit [-a | --interactive | --patch] [-s] [-v] [-u[<mode>]] [--amend]\n"
 	   "           [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>]\n"
 	   "           [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n"
 	   "           [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n"
-- 
gitgitgadget


  parent reply	other threads:[~2025-01-15 20:23 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-03 13:47 [PATCH 0/3] Doc git commit Jean-Noël Avila via GitGitGadget
2025-01-03 13:47 ` [PATCH 1/3] doc: git-commit: apply new documentation guidelines Jean-Noël Avila via GitGitGadget
2025-01-06  7:38   ` Patrick Steinhardt
2025-01-07 21:14     ` Jean-Noël AVILA
2025-01-03 13:47 ` [PATCH 2/3] doc: git-commit.txt: convert git commit config to new format Jean-Noël Avila via GitGitGadget
2025-01-03 13:47 ` [PATCH 3/3] doc: git-commit: migrate secondary files " Jean-Noël Avila via GitGitGadget
2025-01-15 20:23 ` [PATCH v2 0/5] Doc git commit Jean-Noël Avila via GitGitGadget
2025-01-15 20:23   ` [PATCH v2 1/5] doc: apply new documentation guidelines to " Jean-Noël Avila via GitGitGadget
2025-01-15 23:46     ` Junio C Hamano
2025-01-15 20:23   ` Jean-Noël Avila via GitGitGadget [this message]
2025-01-15 20:23   ` [PATCH v2 3/5] doc: make more direct explanations in git commit options Jean-Noël Avila via GitGitGadget
2025-01-15 20:23   ` [PATCH v2 4/5] doc: convert git commit config to new format Jean-Noël Avila via GitGitGadget
2025-01-15 23:49     ` Junio C Hamano
2025-01-15 20:23   ` [PATCH v2 5/5] doc: migrate git-commit manpage secondary files " Jean-Noël Avila via GitGitGadget
2025-01-16 10:17     ` Patrick Steinhardt

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=d58526a9b39571dc2dd2703f62082d20b7a82446.1736972628.git.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=jn.avila@free$(echo .)fr \
    --cc=ps@pks$(echo .)im \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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