git/Documentation/technical, branch v2.15.2

Merge branch 'hn/string-list-doc'

2017-10-11T05:52:22Z

Docfix. * hn/string-list-doc: api-argv-array.txt: remove broken link to string-list API

Merge branch 'jr/hash-migration-plan-doc'

2017-10-11T05:52:22Z

Lay out plans for weaning us off of SHA-1. * jr/hash-migration-plan-doc: technical doc: add a design doc for hash function transition

api-argv-array.txt: remove broken link to string-list API

2017-10-06T12:16:03Z

In 4f665f2cf3 (string-list.h: move documentation from Documentation/api/ into header, 2017-09-26) the string-list API documentation was moved to string-list.h. The argv-array API documentation may follow a similar course in the future. Until then, prevent the broken link from making it to the end-user documentation. Signed-off-by: Todd Zullinger Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano

technical doc: add a design doc for hash function transition

2017-09-28T10:37:52Z

This document describes what a transition to a new hash function for Git would look like. Add it to Documentation/technical/ as the plan of record so that future changes can be recorded as patches. Also-by: Brandon Williams Also-by: Jonathan Tan Also-by: Stefan Beller Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

string-list.h: move documentation from Documentation/api/ into header

2017-09-27T00:14:34Z

This mirrors commit 'bdfdaa497 ("strbuf.h: integrate api-strbuf.txt documentation, 2015-01-16") which did the same for strbuf.h: * API documentation uses /** */ to set it apart from other comments. * Function names were stripped from the comments. * Ordering of the header was adjusted to follow the one from the text file. * Edited some existing comments from string-list.h for consistency. Signed-off-by: Han-Wen Nienhuys Signed-off-by: Junio C Hamano

Merge branch 'ma/remove-config-maybe-bool'

2017-09-19T01:47:55Z

Finishing touches to a recent topic. * ma/remove-config-maybe-bool: config: remove git_config_maybe_bool

Merge branch 'nd/prune-in-worktree'

2017-09-19T01:47:53Z

"git gc" and friends when multiple worktrees are used off of a single repository did not consider the index and per-worktree refs of other worktrees as the root for reachability traversal, making objects that are in use only in other worktrees to be subject to garbage collection. * nd/prune-in-worktree: refs.c: reindent get_submodule_ref_store() refs.c: remove fallback-to-main-store code get_submodule_ref_store() rev-list: expose and document --single-worktree revision.c: --reflog add HEAD reflog from all worktrees files-backend: make reflog iterator go through per-worktree reflog revision.c: --all adds HEAD from all worktrees refs: remove dead for_each_*_submodule() refs.c: move for_each_remote_ref_submodule() to submodule.c revision.c: use refs_for_each*() instead of for_each_*_submodule() refs: add refs_head_ref() refs: move submodule slash stripping code to get_submodule_ref_store refs.c: refactor get_submodule_ref_store(), share common free block revision.c: --indexed-objects add objects from all worktrees revision.c: refactor add_index_objects_to_pending() refs.c: use is_dir_sep() in resolve_gitlink_ref() revision.h: new flag in struct rev_info wrt. worktree-related refs

Merge branch 'ma/up-to-date'

2017-09-10T08:08:22Z

Message and doc updates. * ma/up-to-date: treewide: correct several "up-to-date" to "up to date" Documentation/user-manual: update outdated example output

config: remove git_config_maybe_bool

2017-09-07T00:48:20Z

The function was deprecated in commit 89576613 ("treewide: deprecate git_config_maybe_bool, use git_parse_maybe_bool", 2017-08-07) and has no users. Signed-off-by: Martin Ågren Signed-off-by: Junio C Hamano

refs: remove dead for_each_*_submodule()

2017-08-24T21:56:28Z

These are used in revision.c. After the last patch they are replaced with the refs_ version. Delete them. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano