git, branch v2.9.3

Git 2.9.3

2016-08-12T16:17:51Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/difftool-in-subdir' into maint

2016-08-12T16:16:57Z

"git difftool ..." started in a subdirectory failed to interpret the paths relative to that directory, which has been fixed. * jk/difftool-in-subdir: difftool: use Git::* functions instead of passing around state difftool: avoid $GIT_DIR and $GIT_WORK_TREE difftool: fix argument handling in subdirs

Merge branch 'jk/reset-ident-time-per-commit' into maint

2016-08-12T16:16:56Z

Not-so-recent rewrite of "git am" that started making internal calls into the commit machinery had an unintended regression, in that no matter how many seconds it took to apply many patches, the resulting committer timestamp for the resulting commits were all the same. * jk/reset-ident-time-per-commit: am: reset cached ident date for each patch

Yet another batch for 2.9.3

2016-08-10T18:56:56Z

Signed-off-by: Junio C Hamano

Merge branch 'jh/clean-smudge-f-doc' into maint

2016-08-10T18:55:34Z

A minor documentation update. This was split out from a stalled jh/clean-smudge-annex topic before discarding it. * jh/clean-smudge-f-doc: clarify %f documentation

Merge branch 'rs/use-strbuf-addstr' into maint

2016-08-10T18:55:34Z

* rs/use-strbuf-addstr: use strbuf_addstr() instead of strbuf_addf() with "%s" use strbuf_addstr() for adding constant strings to a strbuf

Merge branch 'cp/completion-clone-recurse-submodules' into maint

2016-08-10T18:55:33Z

* cp/completion-clone-recurse-submodules: completion: add option '--recurse-submodules' to 'git clone'

Merge branch 'jk/t4205-cleanup' into maint

2016-08-10T18:55:32Z

Test modernization. * jk/t4205-cleanup: t4205: indent here documents t4205: drop top-level &&-chaining

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 'js/nedmalloc-gcc6-warnings' into maint

2016-08-10T18:55:31Z

Squelch compiler warnings for netmalloc (in compat/) library. * js/nedmalloc-gcc6-warnings: nedmalloc: work around overzealous GCC 6 warning nedmalloc: fix misleading indentation