builtin-notes: Add "remove" subcommand for removing existing notes

diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index 94cceb13193795ff4fcd2b79f7fd8241b8d393ee..a52d23ac1182d76e282b291e0373c492111e163f 100644 (file)
--- a/Documentation/git-notes.txt
+++ b/Documentation/git-notes.txt
@@ -8,14 +8,14 @@ git-notes - Add/inspect commit notes
 SYNOPSIS
 --------
 [verse]
-'git-notes' (edit [-F <file> | -m <msg>] | show) [commit]
+'git notes' (edit [-F <file> | -m <msg>] | show | remove) [commit]
 
 DESCRIPTION
 -----------
-This command allows you to add notes to commit messages, without
-changing the commit.  To discern these notes from the message stored
-in the commit object, the notes are indented like the message, after
-an unindented line saying "Notes:".
+This command allows you to add/remove notes to/from commit messages,
+without changing the commit.  To discern these notes from the message
+stored in the commit object, the notes are indented like the message,
+after an unindented line saying "Notes:".
 
 To disable commit notes, you have to set the config variable
 core.notesRef to the empty string.  Alternatively, you can set it
@@ -32,19 +32,22 @@ edit::
 show::
        Show the notes for a given commit (defaults to HEAD).
 
+remove::
+       Remove the notes for a given commit (defaults to HEAD).
+       This is equivalent to specifying an empty note message to
+       the `edit` subcommand.
+
 
 OPTIONS
 -------
 -m <msg>::
        Use the given note message (instead of prompting).
-       If multiple `-m` (or `-F`) options are given, their
-       values are concatenated as separate paragraphs.
+       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.
-       If multiple `-F` (or `-m`) options are given, their
-       values are concatenated as separate paragraphs.
 
 
 Author