nvie / gitflow

Git extensions to provide high-level repository operations for Vincent Driessen's branching model.
http://nvie.com/posts/a-successful-git-branching-model/
Other
26.63k stars 2.66k forks source link

Finishing a single feature commit does a fast-forward merge with develop #420

Open krabat opened 9 years ago

krabat commented 9 years ago

The problem with this standard Git-flow behavior is that the Feature-branch name in the merge message is lost. With 2+ commits in a feature branch the merge message would look like "Merge branch 'feature/CRE-128' into develop". Opposed to that, a single commit feature-branch, which is merged with fast-forward only contains the original commit message, which does not has the Feature/JIRA-issue attached to it.

So what are the best practices for single commit features? Always add the "feature/" prefix plus Jira Issue in the first commit comment (as you don't know if more commits will follow)?

I could use the above workaround, but I would prefer a more natural and consistent Git Flow behavior. Please think about changing it. Besides this issue Git Flow is great!