git, branch v2.20.0-rc2

Git 2.20-rc2

2018-12-01T12:44:56Z

Signed-off-by: Junio C Hamano

Merge branch 'gh/diff-raw-has-no-ellipses'

2018-12-01T12:41:45Z

"git diff --raw" lost ellipses to adjust the output columns for some time now, but the documentation still showed them. * gh/diff-raw-has-no-ellipses: doc: update diff-format.txt for removed ellipses in --raw

Merge branch 'ss/msvc-strcasecmp'

2018-12-01T12:41:45Z

MSVC update. * ss/msvc-strcasecmp: msvc: directly use MS version (_stricmp) of strcasecmp

Merge branch 'sg/test-BUG'

2018-12-01T12:41:44Z

test framework has been updated to make a bug in the test script (as opposed to bugs in Git that are discovered by running the tests) stand out more prominently. * sg/test-BUG: tests: send "bug in the test script" errors to the script's stderr

Merge branch 'sg/test-cmp-rev'

2018-12-01T12:41:44Z

Test framework update. * sg/test-cmp-rev: test-lib-functions: make 'test_cmp_rev' more informative on failure

Merge branch 'ab/push-example-in-doc'

2018-12-01T12:41:44Z

An error message that sugggests how to give correct arguments to "git push" has been updated. * ab/push-example-in-doc: push: change needlessly ambiguous example in error

Merge branch 'rt/rebase-in-c-message-fix'

2018-12-01T12:41:44Z

* rt/rebase-in-c-message-fix: builtin/rebase.c: remove superfluous space in messages

Merge branch 'sg/daemon-test-signal-fix'

2018-12-01T12:41:43Z

Test fix. * sg/daemon-test-signal-fix: t/lib-git-daemon: fix signal checking

Merge branch 'ma/reset-doc-rendering-fix'

2018-12-01T12:41:43Z

Doc updates. * ma/reset-doc-rendering-fix: git-reset.txt: render literal examples as monospace git-reset.txt: render tables correctly under Asciidoctor

Merge branch 'ab/replace-graft-with-replace-advice'

2018-12-01T12:41:42Z

The advice message to tell the user to migrate an existing graft file to the replace system when a graft file was read was shown even when "git replace --convert-graft-file" command, which is the way the message suggests to use, was running, which made little sense. * ab/replace-graft-with-replace-advice: advice: don't pointlessly suggest --convert-graft-file