git/Documentation/technical, branch v2.9.3

Merge branch 'jc/hashmap-doc-init' into maint

2016-08-10T18:55:31Z

The API documentation for hashmap was unclear if hashmap_entry can be safely discarded without any other consideration. State that it is safe to do so. * jc/hashmap-doc-init: hashmap: clarify that hashmap_entry can safely be discarded

Merge branch 'sb/pack-protocol-doc-nak' into maint

2016-08-08T21:21:47Z

A doc update. * sb/pack-protocol-doc-nak: Documentation: pack-protocol correct NAK response

hashmap: clarify that hashmap_entry can safely be discarded

2016-08-02T21:34:17Z

The API documentation said that the hashmap_entry structure to be embedded in the caller's structure is to be treated as opaque, which left the reader wondering if it can safely be discarded when it no longer is necessary. If the hashmap_entry structure had references to external resources such as allocated memory or an open file descriptor, merely free(3)ing the containing structure (when the caller's structure is on the heap) or letting it go out of scope (when it is on the stack) would end up leaking the external resource. Document that there is no need for hashmap_entry_clear() that corresponds to hashmap_entry_init() to give the API users a little bit of peace of mind. Signed-off-by: Junio C Hamano

Documentation: pack-protocol correct NAK response

2016-07-22T20:31:55Z

In the transport protocol we use NAK to signal the non existence of a common base, so fix the documentation. This helps readers of the document, as they don't have to wonder about the difference between NAK and NACK. As NACK is used in git archive and upload-archive, this is easy to get wrong. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

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