Start the merging-rebase to upstream/maint

Browse Source

There have been *a ton* of branches merged into `maint` in one fell
swoop (sometimes I really would wish for more organic, continuous
updates to upstream Git's stable branch) that caused a metric ton of
merge conflicts with Git for Windows' add-on patches.

To ease the release engineering of v2.14.2 (which is probably due
soon), let's perform a rebase, cleaning up fixups/squashes at the same
time as resolving merge conflicts.

This commit starts the rebase of a935b95cb1 to 94c9fd268d

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

...

This commit is contained in:

Johannes Schindelin

2017-09-11 12:11:33 +02:00

parent 94c9fd268d 036918aff7

commit f279472f24

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