OpherV
Add squash and rebase params to options
The Gitflow plugin settings allow only a very limited set of flags for common commands. For example: I would like to add the flags '-S' (squash) and '--no-ff' (no fast-forward) to the "feature finish" command.
+1... But...
... I think that the possibility to customize commit messages when features, releases or hotfix are finished, are needed too, because "Merge branch 'feature/xxxxxxx' into develop" is not very explanatory about the realized changes.
@OpherV two options:
- Show a popup asking the message.
- Create the commit message, based on all previous commits of the feature, hotfix or release (merge all messages), but i don't like this option because changes realized on one commit could be reverted on another and this could cause non useful lines in the final commit message.
I think the option 1 is the best way :D
Or maybe both options, the user can be configure the behaviour on the plugins settings :)
I tend to disagree
Merge branch 'feature/xxxxxxx' into develop"
Shows just that - that you merged one branch into another. In the case of finishing a release, for example, two branches are merged (release > master \ release > develop). So I feel it's useful to show what exactly happened in the merge commit in git terms, rather than hiding it behind something more verbose.
In any case is there even a flag to enter custom commit messages in git flow? I don't see any in https://github.com/petervanderdoes/gitflow/wiki/Reference:-git-flow-feature
Remember that Gitflow4idea is essentially just a gui wrapper for gitflow, which is just a wrapper for CLI git. It doesn't add extra functionality beyond what git flow offers.
like you says, i don't see any flag either, so, for now it's not possible :(
+1 It'd be helpful if you could use rebase, squash, etc in finish feature.
+1 But it would be nice to have an option for the --keeplocal flag for the feature finish command
I've started working on a refactor to allow more parameters like squash.
@hypery2k @raciat @pileon @baconner @ztarem @mecid I have to admit I don't use it myself so I want some input from you - are you using squash interactively from the command line? What's your use case?
our use case would be to just have the option to set squash and just have the changes staged. So for us it would be no need for interactive squash
I've started working on a refactor to allow more parameters like squash.
any way to collaborate on this?
@hypery2k @raciat @pileon @baconner @ztarem @mecid I have to admit I don't use it myself so I want some input from you - are you using squash interactively from the command line? What's your use case?
