Start the merging-rebase to v2.21.0-rc2

Browse Source

This is a "dummy" rebase, because we already rebased to that tag.

So why rebase, then? For multiple reasons:

1. to pull in `origin/master`'s commit history (without actually taking
   its changes, because we already forward-ported the
   dont-spawn-gzip-in-archive patches to `rebase-to-v2.21.0`.

2. to reorder some built-in stash related patches into the correct spot.

3. to move the dont-spawn-gzip-in-archive patches into the
   ready-for-upstream branch thicket.

This commit starts the rebase of 948d034ce3 to 1c668b7b88be

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

...

This commit is contained in:

Johannes Schindelin

2019-02-21 11:04:38 +01:00

parent c7d5d9dcf0 406631eac4

commit a4b818922f

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