summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-18 16:02:58 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-19 10:46:42 -0700
commit2d370d2fbcf896912cc0739b806224f9a270bb5e (patch)
treea5454cafe8b7bcd8e4cd5dfed0b33b9bb6b751ed /Documentation
parentnotes remove: allow removing more than one (diff)
downloadtgif-2d370d2fbcf896912cc0739b806224f9a270bb5e.tar.xz
notes remove: --ignore-missing
Depending on the application, it is not necessarily an error for an object to lack a note, especially if the only thing the caller wants to make sure is that notes are cleared for an object. By passing this option from the command line, the "git notes remove" command considers it a success if the object did not have any note to begin with. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-notes.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index e2e1c4c88d..8bbffdf648 100644
--- 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 [<object>...]
+'git notes' remove [--ignore-missing] [<object>...]
'git notes' prune [-n | -v]
'git notes' get-ref
@@ -155,6 +155,10 @@ OPTIONS
'GIT_NOTES_REF' and the "core.notesRef" configuration. The ref
is taken to be in `refs/notes/` if it is not qualified.
+--ignore-missing::
+ Do not consider it an error to request removing notes from an
+ object that does not have notes attached to it.
+
-n::
--dry-run::
Do not remove anything; just report the object names whose notes