Start the merging-rebase to v2.30.1

Browse Source

This commit starts the rebase of 52de3c536a to 36b80a59b799

We are using this opportunity to reorder some patch series into the
`ready-for-upstream` section, and we also rebase the `git maintenance`
patches that so frequently caused merge conflicts during the update of
the ever-green branches (i.e. the branches that are continuously rebased
on top of upstream's integration branches).

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

...

This commit is contained in:

Johannes Schindelin

2021-02-09 11:40:47 +01:00

parent 773e25afc4 a06cc14754

commit f7b4570608

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