summaryrefslogtreecommitdiffstats
path: root/git-pull.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-05 15:14:36 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-05 15:14:36 -0700
commitedf80bdff8acc2ba55267b047475925e8ee8c486 (patch)
treed36ba64c2487235e1fdcfcef9284b717865cb106 /git-pull.html
parenta6c69e1da8b9a61b59f7f26a8c24db11fb239e13 (diff)
downloadgit-htmldocs-edf80bdff8acc2ba55267b047475925e8ee8c486.tar.gz
Autogenerated HTML docs for v1.8.2-470-g21cce
Diffstat (limited to 'git-pull.html')
-rw-r--r--git-pull.html12
1 files changed, 12 insertions, 0 deletions
diff --git a/git-pull.html b/git-pull.html
index 8bfd708b6..4616452d5 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -996,6 +996,18 @@ option can be used to override --squash.</p></div>
</p>
</dd>
<dt class="hdlist1">
+--verify-signatures
+</dt>
+<dt class="hdlist1">
+--no-verify-signatures
+</dt>
+<dd>
+<p>
+ Verify that the commits being merged have good and trusted GPG signatures
+ and abort the merge in case they do not.
+</p>
+</dd>
+<dt class="hdlist1">
--summary
</dt>
<dt class="hdlist1">