From: Jonathan Nieder <jrnieder@gmail.com>
To: git@vger.kernel.org
Cc: Johan Herland <johan@herland.net>,
Sverre Rabbelier <srabbelier@gmail.com>,
Ramkumar Ramachandra <artagnon@gmail.com>,
"Shawn O. Pearce" <spearce@spearce.org>,
Sam Vilain <sam@vilain.net>
Subject: [PATCH 1/2] Documentation/fast-import: explain how to remove a note
Date: Tue, 1 Feb 2011 23:00:22 -0600 [thread overview]
Message-ID: <20110202050022.GD15285@elie> (raw)
In-Reply-To: <20110202045826.GC15285@elie>
A notemodify (N) command with blob id consisting of 40 zeroes (so
is_null_sha1 is true) means to not add a note to replace the existing,
removed one.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
Documentation/git-fast-import.txt | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 4415e63..086b14f 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -651,9 +651,9 @@ External data format::
'N' SP <dataref> SP <committish> LF
....
+
-Here `<dataref>` can be either a mark reference (`:<idnum>`)
-set by a prior `blob` command, or a full 40-byte SHA-1 of an
-existing Git blob object.
+Here `<dataref>` can be a mark reference (`:<idnum>`)
+set by a prior `blob` command, a full 40-byte SHA-1 of an
+existing Git blob object, or 40 zeroes, to remove a note.
Inline data format::
The data content for the note has not been supplied yet.
--
1.7.2.3
next prev parent reply other threads:[~2011-02-02 5:00 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-02 4:58 [PATCH/RFC 0/2] fast-import: introduce "feature notes" command Jonathan Nieder
2011-02-02 5:00 ` Jonathan Nieder [this message]
2011-02-02 5:07 ` [PATCH 2/2] " Jonathan Nieder
2011-02-02 19:47 ` Thomas Rast
2011-02-02 19:57 ` Sverre Rabbelier
2011-02-02 20:22 ` Jonathan Nieder
2011-02-09 21:46 ` [PATCH maint-1.7.0 v2 0/2] " Jonathan Nieder
2011-02-09 22:43 ` [PATCH 1/2] fast-import: clarify documentation of "feature" command Jonathan Nieder
2011-02-09 22:43 ` [PATCH 2/2] fast-import: introduce "feature notes" command Jonathan Nieder
2011-02-09 23:06 ` Sverre Rabbelier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110202050022.GD15285@elie \
--to=jrnieder@gmail.com \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=johan@herland.net \
--cc=sam@vilain.net \
--cc=spearce@spearce.org \
--cc=srabbelier@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).