From: "Robert P. J. Day" <rpjday@crashcourse.ca>
To: Git Mailing list <git@vger.kernel.org>
Subject: [PATCH] notes: fix erroneous "git notes prune [-n | -v]" message
Date: Tue, 21 Nov 2017 12:00:29 -0500 (EST) [thread overview]
Message-ID: <alpine.LFD.2.21.1711211156110.10397@DESKTOP-1GPMCEJ> (raw)
It seems clear that the man page SYNPOSIS and the usage message
referring to:
git notes prune [-n | -v]
is incorrect, as "-n" (dry run) and "-v" (verbose) are not
alternatives, so fix both places to refer to:
git notes prune [-n] [-v | -q]
to match the rest of the man page.
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
---
diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index 43677297f..c75748963 100644
--- a/Documentation/git-notes.txt
+++ b/Documentation/git-notes.txt
@@ -18,7 +18,7 @@ SYNOPSIS
'git notes' merge --commit [-v | -q]
'git notes' merge --abort [-v | -q]
'git notes' remove [--ignore-missing] [--stdin] [<object>...]
-'git notes' prune [-n | -v]
+'git notes' prune [-n] [-v | -q]
'git notes' get-ref
diff --git a/builtin/notes.c b/builtin/notes.c
index d7754db14..43bfe3d6a 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -33,7 +33,7 @@ static const char * const git_notes_usage[] = {
N_("git notes merge --commit [-v | -q]"),
N_("git notes merge --abort [-v | -q]"),
N_("git notes [--ref <notes-ref>] remove [<object>...]"),
- N_("git notes [--ref <notes-ref>] prune [-n | -v]"),
+ N_("git notes [--ref <notes-ref>] prune [-n] [-v | -q]"),
N_("git notes [--ref <notes-ref>] get-ref"),
NULL
};
--
========================================================================
Robert P. J. Day Ottawa, Ontario, CANADA
http://crashcourse.ca
Twitter: http://twitter.com/rpjday
LinkedIn: http://ca.linkedin.com/in/rpjday
========================================================================
next reply other threads:[~2017-11-21 17:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-21 17:00 Robert P. J. Day [this message]
2017-11-21 17:58 ` [PATCH] notes: fix erroneous "git notes prune [-n | -v]" message Jonathan Nieder
2017-11-21 18:34 ` Robert P. J. Day
2017-11-21 18:38 ` Jonathan Nieder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LFD.2.21.1711211156110.10397@DESKTOP-1GPMCEJ \
--to=rpjday@crashcourse.ca \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).