git, branch v2.22.0-rc2

Git 2.22-rc2

2019-05-30T17:56:29Z

Signed-off-by: Junio C Hamano

Merge branch 'js/rebase-config-bitfix'

2019-05-30T17:50:47Z

* js/rebase-config-bitfix: rebase: replace incorrect logical negation by correct bitwise one

Merge branch 'es/doc-gitsubmodules-markup'

2019-05-30T17:50:46Z

Doc markup fix. * es/doc-gitsubmodules-markup: gitsubmodules: align html and nroff lists

Merge branch 'ja/diff-opt-typofix'

2019-05-30T17:50:46Z

Typofix. * ja/diff-opt-typofix: diff: fix mistake in translatable strings

Merge branch 'jt/clone-server-option'

2019-05-30T17:50:46Z

A brown-paper-bag bugfix to a change already in 'master'. * jt/clone-server-option: fetch-pack: send server options after command

Merge branch 'sg/progress-off-by-one-fix'

2019-05-30T17:50:45Z

A brown-paper-bag bugfix to a change already in 'master'. * sg/progress-off-by-one-fix: progress: avoid empty line when breaking the progress line

Merge branch 'js/rebase-deprecate-preserve-merges'

2019-05-30T17:50:45Z

A bit more leftover clean-up to deprepcate "rebase -p". * js/rebase-deprecate-preserve-merges: rebase docs: recommend `-r` over `-p` docs: say that `--rebase=preserve` is deprecated tests: mark a couple more test cases as requiring `rebase -p`

Merge branch 'sg/trace2-rename'

2019-05-30T17:50:45Z

Rename environment variables that are used to control the "trace2" mechanism to a more readable name. * sg/trace2-rename: trace2: document the supported values of GIT_TRACE2* env variables trace2: rename environment variables to GIT_TRACE2*

Merge branch 'jh/trace2'

2019-05-30T17:50:45Z

* jh/trace2: trace2: fix tracing when NO_PTHREADS is defined

Merge branch 'nd/diff-parseopt'

2019-05-30T17:50:44Z

A brown-paper-bag bugfix to a change already in 'master'. * nd/diff-parseopt: parse-options: check empty value in OPT_INTEGER and OPT_ABBREV diff-parseopt: restore -U (no argument) behavior diff-parseopt: correct variable types that are used by parseopt