summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Johan Herland <johan@herland.net>2010-02-13 22:28:31 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-02-13 19:36:15 -0800
commitba20f15e0a220705695a1ee19fb28234861b890d (patch)
treec83cf491b4c13665b69bfd68eb7138efcce58849
parentbuiltin-notes: Add "list" subcommand for listing note objects (diff)
downloadtgif-ba20f15e0a220705695a1ee19fb28234861b890d.tar.xz
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>
-rw-r--r--Documentation/git-notes.txt2
-rw-r--r--builtin-notes.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index 4d29d5fb94..8969f6f8fa 100644
--- a/Documentation/git-notes.txt
+++ b/Documentation/git-notes.txt
@@ -58,11 +58,13 @@ prune::
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>::
+--file=<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 b808534129..ec959bcb31 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()
};