Merge branch 'develop'

Author: ChrisJStone

LICENSE

@@ -1,12 +1,13 @@
-This software is forked of the original git-flow, see License #2.
+This software is forked of the original git-flow-AVH, see License #2.
+Which in turn is a fork of the original get-flow, see License #3
 License #1 is added to reflect the changes made.
 
-gitflow-shFlags is released under LGPL, see License #3
+gitflow-shFlags is released under LGPL, see License #4
 
 ************************************************************
 
 LICENSE #1:
-Copyright (c) 2012-2019 Peter van der Does
+Copyright (c) 2023 Chris Stone
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -29,9 +30,38 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+************************************************************
+
+
 ************************************************************
 
 LICENSE #2:
+Copyright (c) 2012-2019 Peter van der Does
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+************************************************************
+
+LICENSE #3:
 Copyright 2010 Vincent Driessen. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -61,7 +91,7 @@ either expressed or implied, of Vincent Driessen.
 
 ************************************************************
 
-LICENSE #3:
+LICENSE #4:
                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
 

README.md

@@ -231,3 +231,12 @@ the command.
 The files should be placed in .git/hooks  
 In the directory hooks you can find examples of all the hooks available.
 
+
+## Showing your appreciation
+
+Of course, the best way to show your appreciation for the git-flow tool itself
+remains contributing to the community.  If you'd like to show your appreciation
+in another way, however, consider donating through PayPal:
+
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/donate/?hosted_button_id=GU25NCHMVMT9U)
+

git-flow-version

@@ -37,6 +37,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+
 GITFLOW_VERSION=1.12.4
 
 initialize() {