summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Dave Borowitz <dborowitz@google.com>2015-08-19 11:26:47 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-19 12:58:58 -0700
commit68c757f2199911005918aba45aa8ae0fecc72074 (patch)
tree6949b51f4b17abc89212448b2928dbab8393d718 /Documentation
parentpush: support signing pushes iff the server supports it (diff)
downloadtgif-68c757f2199911005918aba45aa8ae0fecc72074.tar.xz
push: add a config option push.gpgSign for default signed pushes
Signed-off-by: Dave Borowitz <dborowitz@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 2e919f0df8..aff13a978f 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2117,6 +2117,14 @@ push.followTags::
may override this configuration at time of push by specifying
'--no-follow-tags'.
+push.gpgSign::
+ May be set to a boolean value, or the string 'if-asked'. A true
+ value causes all pushes to be GPG signed, as if '--signed' is
+ passed to linkgit:git-push[1]. The string 'if-asked' causes
+ pushes to be signed if the server supports it, as if
+ '--signed=if-asked' is passed to 'git push'. A false value may
+ override a value from a lower-priority config file. An explicit
+ command-line flag always overrides this config option.
rebase.stat::
Whether to show a diffstat of what changed upstream since the last