Merge branch 'jk/combine-diff-binary-etc'

diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index 8bbffdf64858a2f462d8a47d4db136b4d0477dc4..6a187f2e2336575fb4974b8c492359913a8c7a9e 100644 (file)
--- a/Documentation/git-notes.txt
+++ b/Documentation/git-notes.txt
@@ -17,7 +17,7 @@ SYNOPSIS
 'git notes' merge [-v | -q] [-s <strategy> ] <notes_ref>
 'git notes' merge --commit [-v | -q]
 'git notes' merge --abort [-v | -q]
-'git notes' remove [--ignore-missing] [<object>...]
+'git notes' remove [--ignore-missing] [--stdin] [<object>...]
 'git notes' prune [-n | -v]
 'git notes' get-ref
 
@@ -159,6 +159,11 @@ OPTIONS
        Do not consider it an error to request removing notes from an
        object that does not have notes attached to it.
 
+--stdin::
+       Also read the object names to remove notes from from the standard
+       input (there is no reason you cannot combine this with object
+       names from the command line).
+
 -n::
 --dry-run::
        Do not remove anything; just report the object names whose notes