builtin-notes: Add --message/--file aliases for -m/-F options

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index 4d29d5fb9489e1700fb7e877f0afdc123fccae4b..8969f6f8fa652e2f6e9428f56190b8f2a2507c4c 100644 (file)
--- a/Documentation/git-notes.txt
+++ b/Documentation/git-notes.txt
@@ -58,11 +58,13 @@ prune::
 OPTIONS
 -------
 -m <msg>::
 OPTIONS
 -------
 -m <msg>::

+--message=<msg>::

        Use the given note message (instead of prompting).
        If multiple `-m` options are given, their values
        are concatenated as separate paragraphs.
 
 -F <file>::
        Use the given note message (instead of prompting).
        If multiple `-m` options are given, their values
        are concatenated as separate paragraphs.
 
 -F <file>::

+--file=<file>::

        Take the note message from the given file.  Use '-' to
        read the note message from the standard input.
 
        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 b808534129c07ddae6981aa02aafcbd27a235dc2..ec959bcb31766a2ca383f55d63bfa1902e6772d4 100644 (file)
--- 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"),
        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),
                             "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()
        };
 
                OPT_END()
        };