Start the merging-rebase to v2.22.0-rc2

Browse Source

In preparation for Git for Windows v2.22.0-rc2, we also use this
opportunity to "fake-merge" Git for Windows' current `master` (i.e. this
merging-rebase starts not with a regular merge, but with an octopus
merge that makes both v2.22.0-rc1.windows.1 *and* `master` reachable).

While at it, we also reorder more patches, in particular moving more
things into the `ready-for-upstream` branch thicket.

This commit starts the rebase of 461161794b to 8cda3201ef25

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

...

This commit is contained in:

Johannes Schindelin

2019-05-31 09:23:50 +02:00

parent 874dd410ce ccc01a164c 34b8e39205

commit 4dd351b194

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