git/Documentation/technical, branch v2.9.2

Documentation/technical: signed merge tag format

2016-06-17T19:10:48Z

Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano

Documentation/technical: signed commit format

2016-06-17T19:10:30Z

Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano

Documentation/technical: signed tag format

2016-06-17T18:40:58Z

Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano

Documentation/technical: describe signature formats

2016-06-17T18:39:05Z

We use different types of signature formats in different places. Set up the infrastructure and overview to describe them systematically in our technical documentation. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano

Merge branch 'pb/commit-verbose-config'

2016-05-23T21:54:32Z

"git commit" learned to pay attention to "commit.verbose" configuration variable and act as if "--verbose" option was given from the command line. * pb/commit-verbose-config: commit: add a commit.verbose config variable t7507-commit-verbose: improve test coverage by testing number of diffs parse-options.c: make OPTION_COUNTUP respect "unspecified" values t/t7507: improve test coverage t0040-parse-options: improve test coverage test-parse-options: print quiet as integer t0040-test-parse-options.sh: fix style issues

Merge branch 'jc/linkgit-fix'

2016-05-17T21:38:31Z

Many 'linkgit:' references were broken, which are all fixed with this. * jc/linkgit-fix: Documentation: fix linkgit references

Merge branch 'lp/typofixes'

2016-05-17T21:38:20Z

* lp/typofixes: typofix: assorted typofixes in comments, documentation and messages

Documentation: fix linkgit references

2016-05-09T22:44:14Z

There are a handful of incorrect "linkgit:[

]" instances in our documentation set. * Some have an extra colon after "linkgit:"; fix them by removing the extra colon; * Some refer to a page outside the Git suite, namely curl(1); fix them by using the `curl(1)` that already appears on the same page for the same purpose of referring the readers to its manual page. * Some spell the name of the page incorrectly, e.g. "rev-list" when they mean "git-rev-list"; fix them. * Some list the manual section incorrectly; fix them to make sure they match what is at the top of the target of the link. Signed-off-by: Junio C Hamano

typofix: assorted typofixes in comments, documentation and messages

2016-05-06T20:16:37Z

Many instances of duplicate words (e.g. "the the path") and a few typoes are fixed, originally in multiple patches. wildmatch: fix duplicate words of "the" t: fix duplicate words of "output" transport-helper: fix duplicate words of "read" Git.pm: fix duplicate words of "return" path: fix duplicate words of "look" pack-protocol.txt: fix duplicate words of "the" precompose-utf8: fix typo of "sequences" split-index: fix typo worktree.c: fix typo remote-ext: fix typo utf8: fix duplicate words of "the" git-cvsserver: fix duplicate words Signed-off-by: Li Peng Signed-off-by: Junio C Hamano

parse-options.c: make OPTION_COUNTUP respect "unspecified" values

2016-05-05T18:52:45Z

OPT_COUNTUP() merely increments the counter upon --option, and resets it to 0 upon --no-option, which means that there is no "unspecified" value with which a client can initialize the counter to determine whether or not --[no]-option was seen at all. Make OPT_COUNTUP() treat any negative number as an "unspecified" value to address this shortcoming. In particular, if a client initializes the counter to -1, then if it is still -1 after parse_options(), then neither --option nor --no-option was seen; if it is 0, then --no-option was seen last, and if it is 1 or greater, than --option was seen last. This change does not affect the behavior of existing clients because they all use the initial value of 0 (or more). Note that builtin/clean.c initializes the variable used with OPT__FORCE (which uses OPT_COUNTUP()) to a negative value, but it is set to either 0 or 1 by reading the configuration before the code calls parse_options(), i.e. as far as parse_options() is concerned, the initial value of the variable is not negative. To test this behavior, in test-parse-options.c, "verbose" is set to "unspecified" while quiet is set to 0 which will test the new behavior with all sets of values. Helped-by: Jeff King Helped-by: Eric Sunshine Helped-by: Junio C Hamano Signed-off-by: Pranit Bauva Signed-off-by: Junio C Hamano