Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Unsupervised release finish (automatic merge messages) #287

Open
wants to merge 2 commits into
from

Conversation

Projects
None yet
2 participants

Currently release finish, while accepting a message for the tag, will still bring up $EDITOR for the merge into master and develop respectively. This makes it a hassle to release finish in a build script. Since I don't think there's a need for custom messages here (in fact I'd discourage them), I simply added a fixed message in each case.

Robert Kosten added some commits Dec 4, 2012

Instead of this patch you can just set an environment variable:

export GIT_MERGE_AUTOEDIT=no

No editor will be brought up on merging.

I'm aware of this, but think it should be enforced inside git flow...

You could add the export of the variable in git-flow and your are all set, for example after https://github.com/nvie/gitflow/blob/develop/git-flow#L41 you can add export GIT_MERGE_AUTOEDIT=no and it's enforced in git-flow.

In my fork, git-flow (AVH Edition), you can set this in a file that will be imported by git-flow (see petervanderdoes/gitflow#39)

Note
Any updates made to git-flow (AVH Edition) are almost impossible to make into easy pull requests for the original git-flow. The source code of the fork has diverged to much to make this an easy process and therefor we won't.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment