summaryrefslogtreecommitdiff
path: root/mergetools/vimdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-08-31 15:39:07 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-31 15:39:08 -0700
commitb21089db6a6006bcf9233f0d8592044ca5553c6a (patch)
tree3180d1a82829f4d9480e43bf68a5f1a4725aa31b /mergetools/vimdiff
parentMerge branch 'jk/notes-merge-config' (diff)
parentpush: add a config option push.gpgSign for default signed pushes (diff)
downloadtgif-b21089db6a6006bcf9233f0d8592044ca5553c6a.tar.xz
Merge branch 'db/push-sign-if-asked'
The client side codepaths in "git push" have been cleaned up and the user can request to perform an optional "signed push", i.e. sign only when the other end accepts signed push. * db/push-sign-if-asked: push: add a config option push.gpgSign for default signed pushes push: support signing pushes iff the server supports it builtin/send-pack.c: use parse_options API config.c: rename git_config_maybe_bool_text and export it as git_parse_maybe_bool transport: remove git_transport_options.push_cert gitremote-helpers.txt: document pushcert option Documentation/git-send-pack.txt: document --signed Documentation/git-send-pack.txt: wrap long synopsis line Documentation/git-push.txt: document when --signed may fail
Diffstat (limited to 'mergetools/vimdiff')
0 files changed, 0 insertions, 0 deletions