Start the merging-rebase to v2.40.1

Browse Source

I previously merged the `main` branch into the (deviating)
v2.40.1.windows.1, in the hopes to make future rebases easier. But that
is not the case, unfortunately.

So let's do a merging-rebase to v2.40.1 (which is already integrated
into Git for Windows' `main` branch), to allow for reordering commits
and cleaning up the branch thicket.

This also allows me to fix my mistake where I should have made the "Drop
the old-style runtime-prefix handling in `interpolate_path()`" commit a
fixup! to the commit that needed to be dropped.

This commit starts the rebase of 1c95112176 to 2df31abb3c37

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

...

This commit is contained in:

Johannes Schindelin

2023-05-11 13:48:49 +02:00

parent 0d1bd1dfb3 09c69550a0

commit ebe0bffb83

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