summaryrefslogtreecommitdiffstats
path: root/git-pull.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-10-20 15:45:24 +0900
committerJunio C Hamano <gitster@pobox.com>2017-10-20 15:45:24 +0900
commitf7e3f4720248d8f301f1a9d734940ac233333bfd (patch)
tree9218fcdf9a6a2d6c5ce3604024f3a30ff09d6eb1 /git-pull.html
parentbadd79c219fe0283e7e2a448cc04da89724eefd9 (diff)
downloadgit-htmldocs-f7e3f4720248d8f301f1a9d734940ac233333bfd.tar.gz
Autogenerated HTML docs for v2.15.0-rc2
Diffstat (limited to 'git-pull.html')
-rw-r--r--git-pull.html19
1 files changed, 17 insertions, 2 deletions
diff --git a/git-pull.html b/git-pull.html
index 40db21d7b..557ea7b09 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -918,6 +918,19 @@ set to <code>no</code> at the beginning of them.</p></div>
</p>
</dd>
<dt class="hdlist1">
+-S[&lt;keyid&gt;]
+</dt>
+<dt class="hdlist1">
+--gpg-sign[=&lt;keyid&gt;]
+</dt>
+<dd>
+<p>
+ GPG-sign the resulting merge commit. The <code>keyid</code> argument is
+ optional and defaults to the committer identity; if specified,
+ it must be stuck to the option without a space.
+</p>
+</dd>
+<dt class="hdlist1">
--log[=&lt;n&gt;]
</dt>
<dt class="hdlist1">
@@ -1301,9 +1314,11 @@ the current repository has the same history as the source repository.</p></div>
(see <a href="git-fetch.html">git-fetch(1)</a>).
</p>
<div class="paragraph"><p>The format of a &lt;refspec&gt; parameter is an optional plus
-<code>+</code>, followed by the source ref &lt;src&gt;, followed
+<code>+</code>, followed by the source &lt;src&gt;, followed
by a colon <code>:</code>, followed by the destination ref &lt;dst&gt;.
-The colon can be omitted when &lt;dst&gt; is empty.</p></div>
+The colon can be omitted when &lt;dst&gt; is empty. &lt;src&gt; is
+typically a ref, but it can also be a fully spelled hex object
+name.</p></div>
<div class="paragraph"><p><code>tag &lt;tag&gt;</code> means the same as <code>refs/tags/&lt;tag&gt;:refs/tags/&lt;tag&gt;</code>;
it requests fetching everything up to the given tag.</p></div>
<div class="paragraph"><p>The remote ref that matches &lt;src&gt;