Release/2.2.0 #74
Merged
Release/2.2.0 #74
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
"git flow log" works not only for feature branches Signed-off-by: Shea690901 <[email protected]>
Since $0 can be assumed to exist, these two flags behave identially, but readlink(1) from busybox does not support "-e", only GNU Coreutils does.
gitflow v2.1.0 * feat: add create command to release allowing for a single step release prodution * feat: add missing hook script filter-flow-release-finish-version * fix: multi-line tag message when using -m * docs: update readme with better description as to why this fork was created. Thank You [shaedrick](https://github.com/shaedrich)
fit: git-flow: prefer "-f" readlink(1) option to "-e"
fix: fixed help text git flow log --help correctly indicates it can be used on all branches
feat: support git environment credentials
…credentials Revert "Support Git Environment Credentials" To see if using closes keyword will close a pull request
Support Git Environment Credentials
Re apply pr Support Git Environment Credentials #412
The -g, --sign flag will create a gpg-signed commit when creating the production branch in a new git repository. This will allow for the option to use the Require Signed Commits branch protection rule on GitHub. closes #59
* docs: update copyright information in source files * docs: update repository url in source files * feat(init): add sign flag to create signed commit The -g, --sign flag will create a gpg-signed commit when creating the production branch in a new git repository. This will allow for the option to use the Require Signed Commits branch protection rule on GitHub. closes #59
Add sub command to git flow feature that allows for a release to be created based off the current feature branch. When running feature release the feature branch is rebased with develop prior to the creation of the release branch. When finishing the release the resulting tag is back merged to the feature branch and not onto the production or develop branches. resolves #63
Create initial version of release command for git flow feature. As proposed in petervanderdoes/gitflow-avh#162. This request closes #63 and also closes petervanderdoes/gitflow-avh#162 as a result.
… #390 The previous solution still caused a merge to develop, it just performed the merge slightly differently which was misleading. The new solution does not merge to develop at all as the flag description implies.
) fix(hotfix): fix nobackmerge flag The previous solution still caused a merge to develop, it just performed the merge slightly differently which was misleading. The new solution does not merge to develop at all as the flag description implies. closes #21
… #390 The previous solution still caused a merge to develop, it just performed the merge slightly differently which was misleading. The new solution does not merge to develop at all as the flag description implies.
Add new option releaseBackMerge to git flow hotfix finish when there is an existing release on a remote repository we can now backmerge the hotfix onto the release branch as well as develop and master. Origional author of PR: Bankers, R.H.M. (Rob) <[email protected]> closes nvie/gitflow#177 and closes petervanderdoes/gitflow-avh#161
Add new option releaseBackMerge to git flow hotfix finish when there is an existing release on a remote repository we can now backmerge the hotfix onto the release branch as well as develop and master. closes #69 closes nvie/gitflow#177 closes petervanderdoes/gitflow-avh#161
Co-authored-by: blooper05 <[email protected]>
Allows for the commits that resolve the hotfix to be applied to the develop branch instead of the entire hotfix branch. This option is not compatible with the nobackmerge or releaseBackmerge flags. The initial pull request provided by [simonweil](https://github.com/simonweil) closes #67 closes #37 closes petervanderdoes#164 closes petervanderdoes#165 Co-authored-by: simonweil <[email protected]>
* 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
ChrisJStone
force-pushed
the
release/2.2.0
branch
from
e07b86b to
2eed4b5
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Version 2.2.0 of gitflow-cjs close the following issues and pull requests