git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCHv2 04/10] commit,merge,tag: describe -m likewise

From
Michael J Gruber <git@drmicha.warpmail.net>
Date
Feb 15, 2011, 13:09 UTC
Message-ID
<4a14b88302dee7fc92d4dca88f13d4a5890dec3f.1297775122.git.git@drmicha.warpmail.net>
In-Reply-To
<cover.1297695910.git.git@drmicha.warpmail.net>

This also removes the superfluous "specify" and rewords the misleading "if any" which sounds as if omitting "-m" would omit the merge commit message. (It means "if a merge commit is created at all".)

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
 builtin/commit.c |    2 +-
 builtin/merge.c  |    4 ++--
 builtin/tag.c    |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index 0245d9f..0090571 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -121,7 +121,7 @@ static struct option builtin_commit_options[] = {
 	OPT_FILENAME('F', "file", &logfile, "read message from file"),
 	OPT_STRING(0, "author", &force_author, "AUTHOR", "override author for commit"),
 	OPT_STRING(0, "date", &force_date, "DATE", "override date for commit"),
-	OPT_CALLBACK('m', "message", &message, "MESSAGE", "specify commit message", opt_parse_m),
+	OPT_CALLBACK('m', "message", &message, "MESSAGE", "commit message", opt_parse_m),
 	OPT_STRING('c', "reedit-message", &edit_message, "COMMIT", "reuse and edit message from specified commit"),
 	OPT_STRING('C', "reuse-message", &use_message, "COMMIT", "reuse message from specified commit"),
 	OPT_STRING(0, "fixup", &fixup_message, "COMMIT", "use autosquash formatted message to fixup specified commit"),
diff --git a/builtin/merge.c b/builtin/merge.c
index 9403747..8c58c3c 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -194,8 +194,8 @@ static struct option builtin_merge_options[] = {
 		"merge strategy to use", option_parse_strategy),
 	OPT_CALLBACK('X', "strategy-option", &xopts, "option=value",
 		"option for selected merge strategy", option_parse_x),
-	OPT_CALLBACK('m', "message", &merge_msg, "message",
-		"message to be used for the merge commit (if any)",
+	OPT_CALLBACK('m', "message", &merge_msg, "MESSAGE",
+		"merge commit message (for a non-fast-forward merge)",
 		option_parse_message),
 	OPT__VERBOSITY(&verbosity),
 	OPT_BOOLEAN(0, "abort", &abort_current_merge,
diff --git a/builtin/tag.c b/builtin/tag.c
index 6408171..246a2bc 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -376,8 +376,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 		OPT_GROUP("Tag creation options"),
 		OPT_BOOLEAN('a', NULL, &annotate,
 					"annotated tag, needs a message"),
-		OPT_CALLBACK('m', NULL, &msg, "msg",
-			     "message for the tag", parse_msg_arg),
+		OPT_CALLBACK('m', NULL, &msg, "MESSAGE",
+			     "tag message", parse_msg_arg),
 		OPT_FILENAME('F', NULL, &msgfile, "read message from file"),
 		OPT_BOOLEAN('s', NULL, &sign, "annotated and GPG-signed tag"),
 		OPT_STRING('u', NULL, &keyid, "key-id",

-- 
1.7.4.1.74.gf39475.dirty
Previous: Michael J GruberNext: Michael J Gruber
Message 30 of 36 in “Cleaning up --help-all inconsistencies”
  1. 0/7 Cleaning up --help-all inconsistenciesMichael J Gruber, Feb 14, 2011
  2. 1/7 commit,tag: use same wording for -FMichael J Gruber, Feb 14, 2011
  3. Junio C HamanoFeb 14, 2011
  4. 2/7 push: describe --porcelain just like commit and statusMichael J Gruber, Feb 14, 2011
  5. Johannes SixtFeb 14, 2011
  6. Junio C HamanoFeb 14, 2011
  7. Sverre RabbelierFeb 14, 2011
  8. Michael J GruberFeb 15, 2011
  9. 3/7 clone,init: describe --template using the same wordingMichael J Gruber, Feb 14, 2011
  10. Junio C HamanoFeb 14, 2011
  11. 4/7 merge,tag: describe -m just like commitMichael J Gruber, Feb 14, 2011
  12. Junio C HamanoFeb 14, 2011
  13. Michael J GruberFeb 15, 2011
  14. Junio C HamanoFeb 15, 2011
  15. 5/7 add: describe --patch like checkout, resetMichael J Gruber, Feb 14, 2011
  16. 6/7 commit,status: describe -u likewiseMichael J Gruber, Feb 14, 2011
  17. Junio C HamanoFeb 14, 2011
  18. Michael J GruberFeb 15, 2011
  19. Jeff KingFeb 15, 2011
  20. 7/7 git-tag.txt: list all modes in the descriptionMichael J Gruber, Feb 14, 2011
  21. Junio C HamanoFeb 14, 2011
  22. 00/10 Cleaning up --help-all inconsistenciesMichael J Gruber, Feb 15, 2011
  23. Junio C HamanoFeb 15, 2011
  24. Michael J GruberFeb 16, 2011
  25. Junio C HamanoFeb 16, 2011
  26. Make <identifier> lowercase in DocumentationMichael J Gruber, Feb 17, 2011
  27. 01/10 commit,tag: use same wording for -FMichael J Gruber, Feb 15, 2011
  28. 02/10 commit,status: describe --porcelain just like pushMichael J Gruber, Feb 15, 2011
  29. 03/10 clone,init: describe --template using the same wordingMichael J Gruber, Feb 15, 2011
  30. 04/10 commit,merge,tag: describe -m likewiseMichael J Gruber, Feb 15, 2011
  31. 05/10 add: describe --patch like checkout, resetMichael J Gruber, Feb 15, 2011
  32. 06/10 commit,status: describe -u likewiseMichael J Gruber, Feb 15, 2011
  33. 07/10 git-tag.txt: list all modes in the descriptionMichael J Gruber, Feb 15, 2011
  34. 08/10 Make <identifier> lowercase as per CodingGuidelinesMichael J Gruber, Feb 15, 2011
  35. 09/10 Make <identifier> lowercase as per CodingGuidelinesMichael J Gruber, Feb 15, 2011
  36. 10/10 Make <identifier> lowercase as per CodingGuidelinesMichael J Gruber, Feb 15, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.