Start the merging-rebase to v2.26.0-rc0

Browse Source

The usual rebase with the usual skipped commits because they made it
upstream.

The only commit that was skipped for another reason is f21f3dc81b
(t1300: mark all test cases with funny filenames as !MINGW, 2017-07-03):
it is no longer necessary, as the respective tests no longer use funny
filenames on Windows.

Also just as usual: the newer PRs that can be upstreamed have been moved
from the tip toward the `ready-for-upstream` sub-thicket.

This commit starts the rebase of f3f903194a to fedb91a8b80

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

...

This commit is contained in:

Johannes Schindelin

2020-03-06 07:11:53 +01:00

parent 076cbdcd73 091745393c

commit 9bf8b40776

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available