diff options
Diffstat (limited to 'git-update-ref.html')
-rw-r--r-- | git-update-ref.html | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/git-update-ref.html b/git-update-ref.html index 6a2c094ee..da088fce2 100644 --- a/git-update-ref.html +++ b/git-update-ref.html @@ -749,7 +749,7 @@ git-update-ref(1) Manual Page <h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git update-ref</em> [-m <reason>] [--no-deref] (-d <ref> [<oldvalue>] | [--create-reflog] <ref> <newvalue> [<oldvalue>] | --stdin [-z])</pre>
+<pre class="content"><em>git update-ref</em> [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])</pre>
<div class="attribution">
</div></div>
</div>
@@ -757,16 +757,16 @@ git-update-ref(1) Manual Page <div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Given two arguments, stores the <newvalue> in the <ref>, possibly
+<div class="paragraph"><p>Given two arguments, stores the <new-oid> in the <ref>, possibly
dereferencing the symbolic refs. E.g. <code>git update-ref HEAD
-<newvalue></code> updates the current branch head to the new object.</p></div>
-<div class="paragraph"><p>Given three arguments, stores the <newvalue> in the <ref>,
+<new-oid></code> updates the current branch head to the new object.</p></div>
+<div class="paragraph"><p>Given three arguments, stores the <new-oid> in the <ref>,
possibly dereferencing the symbolic refs, after verifying that
-the current value of the <ref> matches <oldvalue>.
-E.g. <code>git update-ref refs/heads/master <newvalue> <oldvalue></code>
-updates the master branch head to <newvalue> only if its current
-value is <oldvalue>. You can specify 40 "0" or an empty string
-as <oldvalue> to make sure that the ref you are creating does
+the current value of the <ref> matches <old-oid>.
+E.g. <code>git update-ref refs/heads/master <new-oid> <old-oid></code>
+updates the master branch head to <new-oid> only if its current
+value is <old-oid>. You can specify 40 "0" or an empty string
+as <old-oid> to make sure that the ref you are creating does
not exist.</p></div>
<div class="paragraph"><p>It also allows a "ref" file to be a symbolic pointer to another
ref file by starting with the four-byte header sequence of
@@ -797,15 +797,15 @@ for reading but not for writing (so we’ll never write through a ref symlink to some other tree, if you have copied a whole
archive by creating a symlink tree).</p></div>
<div class="paragraph"><p>With <code>-d</code> flag, it deletes the named <ref> after verifying it
-still contains <oldvalue>.</p></div>
+still contains <old-oid>.</p></div>
<div class="paragraph"><p>With <code>--stdin</code>, update-ref reads instructions from standard input and
performs all modifications together. Specify commands of the form:</p></div>
<div class="literalblock">
<div class="content">
-<pre><code>update SP <ref> SP <newvalue> [SP <oldvalue>] LF
-create SP <ref> SP <newvalue> LF
-delete SP <ref> [SP <oldvalue>] LF
-verify SP <ref> [SP <oldvalue>] LF
+<pre><code>update SP <ref> SP <new-oid> [SP <old-oid>] LF
+create SP <ref> SP <new-oid> LF
+delete SP <ref> [SP <old-oid>] LF
+verify SP <ref> [SP <old-oid>] LF
option SP <opt> LF
start LF
prepare LF
@@ -822,10 +822,10 @@ specify a missing value, omit the value and its preceding SP entirely.</p></div> quoting:</p></div>
<div class="literalblock">
<div class="content">
-<pre><code>update SP <ref> NUL <newvalue> NUL [<oldvalue>] NUL
-create SP <ref> NUL <newvalue> NUL
-delete SP <ref> NUL [<oldvalue>] NUL
-verify SP <ref> NUL [<oldvalue>] NUL
+<pre><code>update SP <ref> NUL <new-oid> NUL [<old-oid>] NUL
+create SP <ref> NUL <new-oid> NUL
+delete SP <ref> NUL [<old-oid>] NUL
+verify SP <ref> NUL [<old-oid>] NUL
option SP <opt> NUL
start NUL
prepare NUL
@@ -843,9 +843,9 @@ update </dt>
<dd>
<p>
- Set <ref> to <newvalue> after verifying <oldvalue>, if given.
- Specify a zero <newvalue> to ensure the ref does not exist
- after the update and/or a zero <oldvalue> to make sure the
+ Set <ref> to <new-oid> after verifying <old-oid>, if given.
+ Specify a zero <new-oid> to ensure the ref does not exist
+ after the update and/or a zero <old-oid> to make sure the
ref does not exist before the update.
</p>
</dd>
@@ -854,8 +854,8 @@ create </dt>
<dd>
<p>
- Create <ref> with <newvalue> after verifying it does not
- exist. The given <newvalue> may not be zero.
+ Create <ref> with <new-oid> after verifying it does not
+ exist. The given <new-oid> may not be zero.
</p>
</dd>
<dt class="hdlist1">
@@ -863,8 +863,8 @@ delete </dt>
<dd>
<p>
- Delete <ref> after verifying it exists with <oldvalue>, if
- given. If given, <oldvalue> may not be zero.
+ Delete <ref> after verifying it exists with <old-oid>, if
+ given. If given, <old-oid> may not be zero.
</p>
</dd>
<dt class="hdlist1">
@@ -872,8 +872,8 @@ verify </dt>
<dd>
<p>
- Verify <ref> against <oldvalue> but do not change it. If
- <oldvalue> is zero or missing, the ref must not exist.
+ Verify <ref> against <old-oid> but do not change it. If
+ <old-oid> is zero or missing, the ref must not exist.
</p>
</dd>
<dt class="hdlist1">
@@ -926,7 +926,7 @@ abort </p>
</dd>
</dl></div>
-<div class="paragraph"><p>If all <ref>s can be locked with matching <oldvalue>s
+<div class="paragraph"><p>If all <ref>s can be locked with matching <old-oid>s
simultaneously, all modifications are performed. Otherwise, no
modifications are performed. Note that while each individual
<ref> is updated or deleted atomically, a concurrent reader may
@@ -949,7 +949,7 @@ formatted as:</p></div> </div></div>
<div class="paragraph"><p>Where "oldsha1" is the 40 character hexadecimal value previously
stored in <ref>, "newsha1" is the 40 character hexadecimal value of
-<newvalue> and "committer" is the committer’s name, email address
+<new-oid> and "committer" is the committer’s name, email address
and date in the standard Git committer ident format.</p></div>
<div class="paragraph"><p>Optionally with -m:</p></div>
<div class="literalblock">
@@ -974,7 +974,7 @@ or does not have committer information available.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-23 14:43:46 PDT
+ 2024-04-10 12:46:30 PDT
</div>
</div>
</body>
|