aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristoffer Haugsbakk <code@khaugsbakk.name>2025-05-27 23:19:37 +0200
committerJunio C Hamano <gitster@pobox.com>2025-05-27 15:31:07 -0700
commit45113e142e188bed5a747fd8a45629bc83c9e3eb (patch)
treedd41829bd8cd2132f2b6ac1ddd35b619bbfae41a
parentdoc: notes: point out copy --stdin use with argv (diff)
downloadgit-45113e142e188bed5a747fd8a45629bc83c9e3eb.tar.gz
git-45113e142e188bed5a747fd8a45629bc83c9e3eb.zip
doc: notes: treat --stdin equally between copy/remove
46538012d94 (notes remove: --stdin reads from the standard input, 2011-05-18) added `--stdin` for the `remove` subcommand, documenting it in the “Options” section. But `copy --stdin` was added before that, in 160baa0d9cb (notes: implement 'git notes copy --stdin', 2010-03-12). Treat this option equally between the two subcommands: • remove: mention `--stdin` on the subcommand as well, like for `copy` • copy: mention it as well under the option documentation Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
-rw-r--r--Documentation/git-notes.adoc8
1 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/git-notes.adoc b/Documentation/git-notes.adoc
index 9ce71ec345..397f6caa92 100644
--- a/Documentation/git-notes.adoc
+++ b/Documentation/git-notes.adoc
@@ -127,6 +127,10 @@ When done, the user can either finalize the merge with
giving zero or one object from the command line, this is
equivalent to specifying an empty note message to
the `edit` subcommand.
++
+In `--stdin` mode, also remove the object names given on standard
+input. In other words, `--stdin` can be combined with object names from
+the command line.
`prune`::
Remove all notes for non-existing/unreachable objects.
@@ -208,9 +212,7 @@ future.
object that does not have notes attached to it.
`--stdin`::
- Also read the object names to remove notes from the standard
- input (there is no reason you cannot combine this with object
- names from the command line).
+ Only valid for `remove` and `copy`. See the respective subcommands.
`-n`::
`--dry-run`::