From de97f1e0af5db7ef771b6053d1fbc081ce9af7fc Mon Sep 17 00:00:00 2001 From: Chris Stone Date: Sat, 10 Jun 2023 18:00:58 -0600 Subject: [PATCH 1/8] Update LICENSE --- LICENSE | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/LICENSE b/LICENSE index 7b0b084d..92600ec2 100644 --- a/LICENSE +++ b/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 From 8aae11edf965ab05896a527cfd7d24a7e1b1371d Mon Sep 17 00:00:00 2001 From: ChrisjStone Date: Sun, 11 Jun 2023 00:37:13 -0600 Subject: [PATCH 2/8] Updated links to reference my fork --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 44536e01..b4fb067b 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ A quick cheatsheet was made by Daniel Kummer: ## Installing git-flow -See the Wiki for up-to-date [Installation Instructions](https://github.com/petervanderdoes/gitflow-avh/wiki/Installation). +See the Wiki for up-to-date [Installation Instructions](https://github.com/CJ-Systems/gitflow-cjs/wiki/Installation). ## Integration with your shell @@ -40,7 +40,7 @@ for the commands not found in the original git-flow. ## FAQ -* See the [FAQ](http://github.com/petervanderdoes/gitflow-avh/wiki/FAQ) section +* See the [FAQ](https://github.com/CJ-Systems/gitflow-cjs/wiki/FAQ) section of the project Wiki. * Version Numbering Scheme. Starting with version 1.0, the project uses the following scheme: @@ -51,7 +51,7 @@ Starting with version 1.0, the project uses the following scheme: This project is under constant development. Feedback and suggestions are very welcome and I encourage you to use the [Issues -list](http://github.com/petervanderdoes/gitflow-avh/issues) on Github to provide that +list](https://github.com/CJ-Systems/gitflow-cjs/issues) on Github to provide that feedback. Feel free to fork this repository and to commit your additions. For a list of From 27636f42c1587b916dcc3ca23e6a58b1aa71b9e0 Mon Sep 17 00:00:00 2001 From: ChrisjStone Date: Sun, 11 Jun 2023 00:37:22 -0600 Subject: [PATCH 3/8] Version bump 1.12.4-rc.1 --- git-flow-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-flow-version b/git-flow-version index 324984c5..989f430e 100644 --- a/git-flow-version +++ b/git-flow-version @@ -37,7 +37,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -GITFLOW_VERSION=1.12.4-dev0 +GITFLOW_VERSION=1.12.4-rc.1 initialize() { # A function can not be empty. Comments count as empty. From e18a05cae415df7383ee6cf4dec5ec6ac5ae6e4b Mon Sep 17 00:00:00 2001 From: ChrisjStone Date: Sun, 11 Jun 2023 00:37:29 -0600 Subject: [PATCH 4/8] Update of the contributers. --- AUTHORS | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index 91115980..009ef627 100644 --- a/AUTHORS +++ b/AUTHORS @@ -20,13 +20,17 @@ Fred Condo Alexandre Dutra Andreas Heiduk Ben Loveridge +ChrisjStone Florian Gamböck Gergely Nagy JP Toto Kiall Mac Innes Lorin Hochstein +Luis Fernando Gomes Olivier Mengué Oppodelldog +Pokey Rule +Silas Palmer Stefan Näwe Adam Gibbins Alexander Groß @@ -35,8 +39,10 @@ Alexander Zeitler Brian St. Pierre Cararus Eugeniu Chad Walker +Chris Stone Craig Fowler Emre Berge Ergenekon +Gene Pavlovsky Gregor A. Cieslak Gruen Christian-Rolf (Kiki) Guillaume-Jean Herbiet @@ -55,7 +61,7 @@ Justin Penney Konstantin Tjuterev Kridsada Thanabulpong Leonardo Giordani -Luis Fernando Gomes @luiscoms +Luca Orlandi Mark Borcherding Mark Derricutt Mateusz Kaczmarek @@ -64,12 +70,12 @@ Mayerber Carvalho Neto Nowell Strite Opher Vishnia Peter Schröder -Pokey Rule Stefan Schüßler Steffen Jaeckel Steve Mao Steve Streeting Tacit Sawk +Tiscs Vedang Manerikar Zheeeng eddie cianci From 0fb7013cf880ed22d3c88d8e5fed7b97f5e1215e Mon Sep 17 00:00:00 2001 From: ChrisjStone Date: Sun, 11 Jun 2023 00:37:29 -0600 Subject: [PATCH 5/8] Version bump 1.12.4 --- git-flow-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-flow-version b/git-flow-version index 989f430e..5707b042 100644 --- a/git-flow-version +++ b/git-flow-version @@ -37,7 +37,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -GITFLOW_VERSION=1.12.4-rc.1 +GITFLOW_VERSION=1.12.4 initialize() { # A function can not be empty. Comments count as empty. From 74fa0a8d0cc6983514b6c34824bf0458d1d6879c Mon Sep 17 00:00:00 2001 From: ChrisjStone Date: Sun, 11 Jun 2023 00:38:02 -0600 Subject: [PATCH 6/8] Preparation for new development cycle after release 1.12.4 --- git-flow-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-flow-version b/git-flow-version index 5707b042..1847b8dc 100644 --- a/git-flow-version +++ b/git-flow-version @@ -37,7 +37,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -GITFLOW_VERSION=1.12.4 +GITFLOW_VERSION=1.13.0-dev.1 initialize() { # A function can not be empty. Comments count as empty. From a8ce0187e35b65f3251c2f76d3f0b65a2c0f2bd3 Mon Sep 17 00:00:00 2001 From: Chris Stone Date: Sun, 11 Jun 2023 01:17:19 -0600 Subject: [PATCH 7/8] Update README.md Add donation link --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index b4fb067b..6c47c06d 100644 --- a/README.md +++ b/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: + +https://www.paypal.com/donate/?hosted_button_id=GU25NCHMVMT9U + From d593a16bef28d2acd801195c78062255477c11ba Mon Sep 17 00:00:00 2001 From: Chris Stone Date: Sun, 11 Jun 2023 01:24:26 -0600 Subject: [PATCH 8/8] Update README.md Fix donation link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6c47c06d..7144fd7e 100644 --- a/README.md +++ b/README.md @@ -238,5 +238,5 @@ 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: -https://www.paypal.com/donate/?hosted_button_id=GU25NCHMVMT9U +[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/donate/?hosted_button_id=GU25NCHMVMT9U)