From: Junio C Hamano Date: Wed, 6 Apr 2016 18:39:13 +0000 (-0700) Subject: Merge branch 'la/tag-force-signing-annotated-tags' X-Git-Tag: v2.9.0-rc0~146 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a2595f05c7d8c9369623cbc19f92f3f1be6fb534?hp=-c Merge branch 'la/tag-force-signing-annotated-tags' "git tag" can create an annotated tag without explicitly given an "-a" (or "-s") option (i.e. when a tag message is given). A new configuration variable, tag.forceSignAnnotated, can be used to tell the command to create signed tag in such a situation. * la/tag-force-signing-annotated-tags: tag: add the option to force signing of annotated tags --- a2595f05c7d8c9369623cbc19f92f3f1be6fb534 diff --combined Documentation/config.txt index d29665666b,95d5c9dbf0..42d2b50477 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@@ -1113,9 -1113,8 +1113,9 @@@ commit.template: credential.helper:: Specify an external helper to be called when a username or password credential is needed; the helper may consult external - storage to avoid prompting the user for the credentials. See - linkgit:gitcredentials[7] for details. + storage to avoid prompting the user for the credentials. Note + that multiple helpers may be defined. See linkgit:gitcredentials[7] + for details. credential.useHttpPath:: When acquiring credentials, consider the "path" component of an http @@@ -1887,14 -1886,6 +1887,14 @@@ interactive.singleKey: setting is silently ignored if portable keystroke input is not available; requires the Perl module Term::ReadKey. +interactive.diffFilter:: + When an interactive command (such as `git add --patch`) shows + a colorized diff, git will pipe the diff through the shell + command defined by this configuration variable. The command may + mark up the diff further for human consumption, provided that it + retains a one-to-one correspondence with the lines in the + original diff. Defaults to disabled (no filtering). + log.abbrevCommit:: If true, makes linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1] assume `--abbrev-commit`. You may @@@ -2738,12 -2729,11 +2738,17 @@@ submodule..ignore: "--ignore-submodules" option. The 'git submodule' commands are not affected by this setting. +submodule.fetchJobs:: + Specifies how many submodules are fetched/cloned at the same time. + A positive integer allows up to that number of submodules fetched + in parallel. A value of 0 will give some reasonable default. + If unset, it defaults to 1. + + tag.forceSignAnnotated:: + A boolean to specify whether annotated tags created should be GPG signed. + If `--annotate` is specified on the command line, it takes + precedence over this option. + tag.sort:: This variable controls the sort ordering of tags when displayed by linkgit:git-tag[1]. Without the "--sort=" option provided, the