diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-01-04 14:31:57 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-01-04 14:31:57 -0800 |
commit | de48f457367f37c28229ebe8e6cef849dd6e430a (patch) | |
tree | c0e656a1b610026344048379922f2fd2df8d549f /git-push.html | |
parent | 2e1a9d9baa0719a5a67da9c049bffc04c23272bd (diff) | |
download | git-htmldocs-de48f457367f37c28229ebe8e6cef849dd6e430a.tar.gz |
Autogenerated HTML docs for v2.20.1-98-gecbdaf
Diffstat (limited to 'git-push.html')
-rw-r--r-- | git-push.html | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/git-push.html b/git-push.html index eabe5ce3c..89e6d48db 100644 --- a/git-push.html +++ b/git-push.html @@ -821,6 +821,36 @@ update some ref at the destination with <code><src></code> with be omitted—such a push will update a ref that <code><src></code> normally updates
without any <code><refspec></code> on the command line. Otherwise, missing
<code>:<dst></code> means to update the same ref as the <code><src></code>.</p></div>
+<div class="paragraph"><p>If <dst> doesn’t start with <code>refs/</code> (e.g. <code>refs/heads/master</code>) we will
+try to infer where in <code>refs/*</code> on the destination <repository> it
+belongs based on the the type of <src> being pushed and whether <dst>
+is ambiguous.</p></div>
+<div class="openblock">
+<div class="content">
+<div class="ulist"><ul>
+<li>
+<p>
+If <dst> unambiguously refers to a ref on the <repository> remote,
+ then push to that ref.
+</p>
+</li>
+<li>
+<p>
+If <src> resolves to a ref starting with refs/heads/ or refs/tags/,
+ then prepend that to <dst>.
+</p>
+</li>
+<li>
+<p>
+Other ambiguity resolutions might be added in the future, but for
+ now any other cases will error out with an error indicating what we
+ tried, and depending on the <code>advice.pushUnqualifiedRefname</code>
+ configuration (see <a href="git-config.html">git-config(1)</a>) suggest what refs/
+ namespace you may have wanted to push to.
+</p>
+</li>
+</ul></div>
+</div></div>
<div class="paragraph"><p>The object referenced by <src> is used to update the <dst> reference
on the remote side. Whether this is allowed depends on where in
<code>refs/*</code> the <dst> reference lives as described in detail below, in
@@ -1789,6 +1819,8 @@ the ones in the examples below) can be configured as the default for <code>refs/remotes/satellite/master</code>) in the <code>mothership</code> repository;
do the same for <code>dev</code> and <code>satellite/dev</code>.
</p>
+<div class="paragraph"><p>See the section describing <code><refspec>...</code> above for a discussion of
+the matching semantics.</p></div>
<div class="paragraph"><p>This is to emulate <code>git fetch</code> run on the <code>mothership</code> using <code>git
push</code> that is run in the opposite direction in order to integrate
the work done on <code>satellite</code>, and is often necessary when you can
@@ -1912,7 +1944,7 @@ As in #1, the attacker chooses an object ID X to steal. The victim sends <div id="footer">
<div id="footer-text">
Last updated
- 2018-09-21 06:53:21 JST
+ 2019-01-04 14:31:36 PST
</div>
</div>
</body>
|