Merge git tag '1.4.0' into branch 'develop' (FINERACT-1154)

Browse Source

git checkout develop
    git checkout -b FINERACT-1154_merge-1.4.0
    git merge -s recursive -Xignore-all-space 1.4.0

see discussion in https://issues.apache.org/jira/browse/FINERACT-1154
for the full background about why we are doing this; the TL;DR is that
this makes `git describe` work correctly, which is important for automation.

...

This commit is contained in:

Michael Vorburger

2020-10-11 14:50:44 +02:00

parent 3ee46b040b ee99f30e53

commit 09e08fdc71

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