summaryrefslogtreecommitdiffstats
path: root/git-pull.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-11-14 08:26:31 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-11-14 08:26:31 +0000
commit283634923aa8f124696f3e9a77a012b96493c2d7 (patch)
tree3fe6cb2831bcd0b11ae6c10ba410d51f0e0af134 /git-pull.html
parent9bd39c47653f45f81dbbe7210dbb55d738b3f5e7 (diff)
downloadgit-htmldocs-283634923aa8f124696f3e9a77a012b96493c2d7.tar.gz
Autogenerated HTML docs for v1.6.0.4-724-ga0d3a
Diffstat (limited to 'git-pull.html')
-rw-r--r--git-pull.html20
1 files changed, 13 insertions, 7 deletions
diff --git a/git-pull.html b/git-pull.html
index 556ebdbd7..b53bc0d43 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -906,14 +906,20 @@ This file should have the following format:</p></div>
<div class="content">
<pre><tt> &lt;url&gt;#&lt;head&gt;</tt></pre>
</div></div>
-<div class="para"><p><tt>&lt;url&gt;</tt> is required; <tt>#&lt;head&gt;</tt> is optional.
-When you do not provide a refspec on the command line,
-git will use the following refspec, where <tt>&lt;head&gt;</tt> defaults to <tt>master</tt>,
-and <tt>&lt;repository&gt;</tt> is the name of this file
-you provided in the command line.</p></div>
+<div class="para"><p><tt>&lt;url&gt;</tt> is required; <tt>#&lt;head&gt;</tt> is optional.</p></div>
+<div class="para"><p>Depending on the operation, git will use one of the following
+refspecs, if you don't provide one on the command line.
+<tt>&lt;branch&gt;</tt> is the name of this file in <tt>$GIT_DIR/branches</tt> and
+<tt>&lt;head&gt;</tt> defaults to <tt>master</tt>.</p></div>
+<div class="para"><p>git fetch uses:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> refs/heads/&lt;head&gt;:&lt;repository&gt;</tt></pre>
+<pre><tt> refs/heads/&lt;head&gt;:refs/heads/&lt;branch&gt;</tt></pre>
+</div></div>
+<div class="para"><p>git push uses:</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><tt> HEAD:refs/heads/&lt;head&gt;</tt></pre>
</div></div>
</div>
<h2 id="_merge_strategies">MERGE STRATEGIES</h2>
@@ -1149,7 +1155,7 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-10-31 11:28:44 UTC
+Last updated 2008-11-14 08:26:10 UTC
</div>
</div>
</body>