diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-08 11:59:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-08 11:59:27 -0700 |
| commit | b5a52fa6c694c891a259233b29eb0ef4a47db57b (patch) | |
| tree | 58fcebb324b516f3076589ff77519c8733b9f75b /builtin/notes.c | |
| parent | Merge branch 'jk/commit-dates-parsing-fix' (diff) | |
| parent | parse-options: make sure argh string does not have SP or _ (diff) | |
| download | git-b5a52fa6c694c891a259233b29eb0ef4a47db57b.tar.gz git-b5a52fa6c694c891a259233b29eb0ef4a47db57b.zip | |
Merge branch 'jc/rev-parse-argh-dashed-multi-words'
Make sure that the help text given to describe the "<param>" part
of the "git cmd --option=<param>" does not contain SP or _,
e.g. "--gpg-sign=<key-id>" option for "git commit" is not spelled
as "--gpg-sign=<key id>".
* jc/rev-parse-argh-dashed-multi-words:
parse-options: make sure argh string does not have SP or _
update-index: teach --cacheinfo a new syntax "mode,sha1,path"
parse-options: multi-word argh should use dash to separate words
Diffstat (limited to 'builtin/notes.c')
| -rw-r--r-- | builtin/notes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/notes.c b/builtin/notes.c index bb89930373..39c8573cde 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -939,7 +939,7 @@ int cmd_notes(int argc, const char **argv, const char *prefix) int result; const char *override_notes_ref = NULL; struct option options[] = { - OPT_STRING(0, "ref", &override_notes_ref, N_("notes_ref"), + OPT_STRING(0, "ref", &override_notes_ref, N_("notes-ref"), N_("use notes from <notes_ref>")), OPT_END() }; |