From: Johan Herland Date: Sat, 13 Feb 2010 21:28:31 GMT Subject: [PATCHv13 23/30] builtin-notes: Add --message/--file aliases for -m/-F options Message-ID: <1266096518-2104-24-git-send-email-johan@herland.net> In-Reply-To: <1266096518-2104-1-git-send-email-johan@herland.net> Signed-off-by: Johan Herland --- Documentation/git-notes.txt | 2 ++ builtin-notes.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt index 4d29d5f..8969f6f 100644 --- a/Documentation/git-notes.txt +++ b/Documentation/git-notes.txt @@ -58,11 +58,13 @@ prune:: OPTIONS ------- -m :: +--message=:: Use the given note message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. -F :: +--file=:: Take the note message from the given file. Use '-' to read the note message from the standard input. diff --git a/builtin-notes.c b/builtin-notes.c index b808534..ec959bc 100644 --- a/builtin-notes.c +++ b/builtin-notes.c @@ -217,9 +217,9 @@ int cmd_notes(int argc, const char **argv, const char *prefix) struct msg_arg msg = { 0, STRBUF_INIT }; struct option options[] = { OPT_GROUP("Notes edit options"), - OPT_CALLBACK('m', NULL, &msg, "msg", + OPT_CALLBACK('m', "message", &msg, "msg", "note contents as a string", parse_msg_arg), - OPT_FILENAME('F', NULL, &msgfile, "note contents in a file"), + OPT_FILENAME('F', "file", &msgfile, "note contents in a file"), OPT_END() }; -- 1.7.0.rc1.141.gd3fd