git, branch v2.16.2

Git 2.16.2

2018-02-15T23:21:23Z

Signed-off-by: Junio C Hamano

Merge branch 'ab/doc-cat-file-e-still-shows-errors' into maint

2018-02-15T23:18:15Z

Doc update. * ab/doc-cat-file-e-still-shows-errors: cat-file doc: document that -e will return some output

Merge branch 'as/read-tree-prefix-doc-fix' into maint

2018-02-15T23:18:14Z

Doc update. * as/read-tree-prefix-doc-fix: doc/read-tree: remove obsolete remark

Merge branch 'nd/add-i-ignore-submodules' into maint

2018-02-15T23:18:13Z

"git add -p" was taught to ignore local changes to submodules as they do not interfere with the partial addition of regular changes anyway. * nd/add-i-ignore-submodules: add--interactive: ignore submodule changes except HEAD

Merge branch 'tg/stash-with-pathspec-fix' into maint

2018-02-15T23:18:13Z

"git stash -- " incorrectly blew away untracked files in the directory that matched the pathspec, which has been corrected. * tg/stash-with-pathspec-fix: stash: don't delete untracked files that match pathspec

Merge branch 'jk/abort-clone-with-existing-dest' into maint

2018-02-15T23:18:13Z

"git clone $there $here" is allowed even when here directory exists as long as it is an empty directory, but the command incorrectly removed it upon a failure of the operation. * jk/abort-clone-with-existing-dest: clone: do not clean up directories we didn't create clone: factor out dir_exists() helper t5600: modernize style t5600: fix outdated comment about unborn HEAD

Merge branch 'jc/merge-symlink-ours-theirs' into maint

2018-02-15T23:18:12Z

"git merge -Xours/-Xtheirs" learned to use our/their version when resolving a conflicting updates to a symbolic link. * jc/merge-symlink-ours-theirs: merge: teach -Xours/-Xtheirs to symbolic link merge

Merge branch 'rs/lose-leak-pending' into maint

2018-02-15T23:18:11Z

API clean-up around revision traversal. * rs/lose-leak-pending: commit: remove unused function clear_commit_marks_for_object_array() revision: remove the unused flag leak_pending checkout: avoid using the rev_info flag leak_pending bundle: avoid using the rev_info flag leak_pending bisect: avoid using the rev_info flag leak_pending object: add clear_commit_marks_all() ref-filter: use clear_commit_marks_many() in do_merge_filter() commit: use clear_commit_marks_many() in remove_redundant() commit: avoid allocation in clear_commit_marks_many()

Merge branch 'jm/svn-pushmergeinfo-fix' into maint

2018-02-15T23:18:11Z

"git svn dcommit" did not take into account the fact that a svn+ssh:// URL with a username@ (typically used for pushing) refers to the same SVN repository without the username@ and failed when svn.pushmergeinfo option is set. * jm/svn-pushmergeinfo-fix: git-svn: fix svn.pushmergeinfo handling of svn+ssh usernames.

Merge branch 'dk/describe-all-output-fix' into maint

2018-02-15T23:18:10Z

An old regression in "git describe --all $annotated_tag^0" has been fixed. * dk/describe-all-output-fix: describe: prepend "tags/" when describing tags with embedded name