Skip to content

Commit e337c88

Browse files
committed
docs(changelog): add release notes
* feat(git-flow): add support for busybox(#12) * feat(init): add support for environment credentials (#19) Allows git flow to fall back to the same environment variables git uses for setting the author and committer details if they are not present in the users .gitconfig * feat(init): add option to sign initial commit (#59) When running git flow init the following option is now available when creating a git repository using git flow.. 1) -g, --[no]sign Sign initial commit when creating a repository When setting up git flow in a freshly created git repository with no prior commits or when using git flow to create a git repository in an existing folder the sign flag will create a signed empty commit with the message initial commit. * feat(feature): add feature release command (#64) Added git flow feature release to provide a quick way to create a release branch from a existing feature branch. * fix(hotfix): git flow hotfix track fails due to branch name check (#68) * feat(hotfix): add cherrypick option to hotfix finish (#73) * feat(hotfix): add backmerge option to release branch (#71) * fix(hotfix): git flow hotfix finish -b back-merges to develop (#66) When runing hotfix finish the following options have been the following options have been added: 1) -r, --releaseBackmerge Back-merge to release branch if exists 2) -c, --cherrypick Cherry Pick to develop instead of merge 3) -b, --[no]nobackmerge Don't merge master, or tag onto develop NOTE: One one of the above three options can be used at any given time since it doesn't make sence to combine them. * fix(log): fix git flow log help message (#15) git flow log help no longer implies it can only be used with feature branches
1 parent ca6828e commit e337c88

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

CHANGELOG.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# Changelog
22

3-
#### 2.2.0-SNAPSHOT
4-
* feat: add option to hotfix finish to allow for backmerge to release branch. Thank You [Bankers88](https://github.com/Bankers88)
5-
* fix: Prevent hotfixes being merged to develop with nobackmerge flag. Thank You [adamrodger](https://github.com/adamrodger)
6-
* feat(feature): add release sub command. Thank You [codesurf42](https://github.com/codesurf42) for the initial pr
7-
* feat(init): add sign flag to create initial signed commit
8-
* feat(init): add support for "Support Git Environment Credentials" pull request #19 from filipekiss/feature/environment_credentials
9-
* docs: update repository url in source files
10-
* docs: update copyright information in source files
11-
* fix: wording for help text in git flow log pull request #15 from Shea690901/hotfix/git-flow-log_help-message
12-
* refactor(git-flow): add support for busybox-readlink request #12 from KAction/readlink-busybox
3+
#### 2.2.0
4+
* feat(init): add option to sign initial commit (#59)
5+
* feat(git-flow): add support for environment credentials (#19)
6+
* feat(git-flow): add support for busybox(#12)
7+
* feat(feature): add feature release command (#64)
8+
* feat(hotfix): add cherrypick option to hotfix finish (#73)
9+
* feat(hotfix): add backmerge option to release branch (#71)
10+
* fix(hotfix): git flow hotfix finish -b still back-merges to develop (#66)
11+
* fix(hotfix): git flow hotfix track fails due to branch name check (#68)
12+
* fix: git flow log help message (#15)
1313

1414
#### 2.1.0
1515
* feat: add create command to release allowing for a single step release prodution

git-flow-hotfix

+5-1
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ showcommands! Show git commands while executing them
366366

367367
cmd_finish() {
368368
OPTIONS_SPEC="\
369-
git flow hotfix finish [-h] [-F] [-s] [-u] [-m | -f ] [-p] [-k] [-n] [-b | -c] [-S] <version>
369+
git flow hotfix finish [-h] [-F] [-s] [-u] [-m | -f ] [-p] [-k] [-n] [-b | -c | -r] [-S] <version>
370370
371371
Finish hotfix branch <version>
372372
--
@@ -465,6 +465,10 @@ c,cherrypick Cherry Pick to $DEVELOP_BRANCH instead of merge
465465
die "You can't use 'cherrypick' and 'releasebackmerge' together."
466466
fi
467467

468+
if flag nobackmerge && flag releasebackmerge; then
469+
die "You can't use 'nobackmerge' && 'releasebackmerge' together."
470+
fi
471+
468472
# Sanity checks
469473
require_branch "$BRANCH"
470474
require_clean_working_tree

git-flow-init

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ parse_args() {
5959
# Default entry when no SUBACTION is given
6060
cmd_default() {
6161
OPTIONS_SPEC="\
62-
git flow init [-h] [-d] [-f]
62+
git flow init [-h] [-d] [-f] [-g]
6363
6464
Setup a git repository for git flow usage. Can also be used to start a git repository.
6565
--
@@ -396,7 +396,7 @@ file= use given config file
396396
[ "$answer" = "-" ] && prefix= || prefix=${answer:-$default_suggestion}
397397
git_do config $gitflow_config_option gitflow.prefix.support "$prefix"
398398
fi
399-
399+
400400
# Version tag prefix
401401
if ! git config --get gitflow.prefix.versiontag >/dev/null 2>&1 || flag force; then
402402
if [ "$FLAGS_tag" != "" ]; then

0 commit comments

Comments
 (0)