describe: prepend "tags/" when describing tags with embedded name
diff.h: make pickaxe_opts an unsigned bit field
diff: introduce DIFF_PICKAXE_KINDS_MASK
oidmap: ensure map is initialized
perf/run: learn to send output to codespeed server
Merge branch 'ab/perf-grep-threads'
Merge branch 'ab/commit-m-with-fixup'
Merge branch 'mm/send-email-fallback-to-local-mail-address'
Merge branch 'jm/svn-pushmergeinfo-fix'
cat-file doc: document that -e will return some output
perl/Git: remove now useless email-address parsing code
stash: don't delete untracked files that match pathspec
wt-status.c: coding style fix
t2203: test status output with porcelain v2 format
wt-status.c: handle worktree renames
Merge branch 'rs/lose-leak-pending'
diffcore: add a pickaxe option to find a specific blob
t/lib-submodule-update.sh: clarify test
object: add clear_commit_marks_all()
commit: remove unused function clear_commit_marks_for_object_array()
doc/read-tree: remove obsolete remark
Merge branch 'nd/ita-wt-renames-in-status'
ref-filter: use clear_commit_marks_many() in do_merge_filter()
diff: properly error out when combining multiple pickaxe options
submodule: submodule_move_head omits old argument in forced case
commit: add support for --fixup <commit> -m"<extra message>"
Merge branch 'ab/doc-cat-file-e-still-shows-errors'
wt-status.c: rename rename-related fields in wt_status_change_data
commit: use clear_commit_marks_many() in remove_redundant()
git-svn: fix svn.pushmergeinfo handling of svn+ssh usernames.
commit: avoid allocation in clear_commit_marks_many()
clone: factor out dir_exists() helper
t5600: fix outdated comment about unborn HEAD
diff: migrate diff_flags.pickaxe_ignore_case to a pickaxe_opts bit
Merge branch 'sb/diff-blobfind-pickaxe'
Merge branch 'sb/submodule-update-reset-fix'
Merge branch 'nd/add-i-ignore-submodules'
Merge branch 'tg/stash-with-pathspec-fix'
Merge branch 'jk/abort-clone-with-existing-dest'
unpack-trees: oneway_merge to update submodules
perf/aggregate: fix checking ENV{GIT_PERF_SUBSECTION}
t/lib-submodule-update.sh: fix test ignoring ignored files in submodules
send-email: add and use a local copy of Mail::Address
merge: teach -Xours/-Xtheirs to symbolic link merge
revision: remove the unused flag leak_pending
checkout: avoid using the rev_info flag leak_pending
clone: do not clean up directories we didn't create
perf/run: learn about perf.codespeedOutput
diff: use HAS_MULTI_BITS instead of counting bits manually
add--interactive: ignore submodule changes except HEAD
Use DIFF_DETECT_RENAME for detect_rename assignments
bundle: avoid using the rev_info flag leak_pending
Merge branch 'jc/merge-symlink-ours-theirs'
bisect: debug: convert struct object to object_id
Merge branch 'dk/describe-all-output-fix'
bisect: avoid using the rev_info flag leak_pending
perf/run: add conf_opts argument to get_var_from_env_or_config()
t5600: modernize style
First batch after 2.16
Merge branch 'as/read-tree-prefix-doc-fix'
Merge branch 'ys/bisect-object-id-missing-conversion-fix'
perf: amend the grep tests to test grep.threads
Merge branch 'bw/oidmap-autoinit'
Merge branch 'cc/codespeed'
wt-status.c: catch unhandled diff status codes
perf/run: read GIT_PERF_REPO_NAME from perf.repoName
perf/aggregate: refactor printing results
commit doc: document that -c, -C, -F and --fixup with -m error
perf/aggregate: implement codespeed JSON output
send-email: add test for Linux's get_maintainer.pl
repository: pre-initialize hash algo pointer
t5601-clone: test case-conflicting files on case-insensitive filesystem
Git 2.16.1
Sync with v2.16.1
Start 2.17 cycle
Merge branch 'bc/hash-algo' into maint
Git 2.16
RelNotes: minor typofix
oidset: don't return value from oidset_init
Merge branch 'js/test-with-ws-in-path'
Documentation/git-worktree.txt: add missing `
t3900: add some more quotes
Merge branch 'jh/object-filtering'
Merge branch 'tg/worktree-create-tracking'
Git 2.16-rc2
Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty-index
Merge branch 'ma/bisect-leakfix'
merge-recursive: do not look at the index during recursive merge
RelNotes update before -rc2
Merge branch 'js/perl-path-workaround-in-tests'
bisect: fix a regression causing a segfault
mingw: handle GITPERLLIB in t0021 in a Windows-compatible way
Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'
rebase -p: fix quoting when calling `git merge`
Merge branch 'ew/empty-merge-with-dirty-index'
Merge branch 'jk/doc-diff-options'
travis-ci: check that all build artifacts are .gitignore-d
Allow the test suite to pass in a directory whose name contains spaces
Makefile: NO_OPENSSL=1 should no longer imply BLK_SHA1=1
t0302 & t3900: add forgotten quotes