Merge branch 'bg/apply-blank-trailing-context' into maint

diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index e2701cff1af034fbc1794f8e4b42458b67a47f92..4e5113b837230c8f050cf4bbe10e8de4b3271bd0 100644 (file)
--- a/Documentation/git-notes.txt
+++ b/Documentation/git-notes.txt
@@ -51,13 +51,13 @@ list::
 
 add::
        Add notes for a given object (defaults to HEAD). Abort if the
-       object already has notes, abort. (use `-f` to overwrite an
+       object already has notes (use `-f` to overwrite an
        existing note).
 
 copy::
        Copy the notes for the first object onto the second object.
        Abort if the second object already has notes, or if the first
-       objects has none. (use -f to overwrite existing notes to the
+       object has none (use -f to overwrite existing notes to the
        second object). This subcommand is equivalent to:
        `git notes add [-f] -C $(git notes list <from-object>) <to-object>`
 +