add config option to change the default behavior of git flow feature fin... #226

Closed
wants to merge 1 commit into
from

Conversation

Projects
None yet
4 participants

salzig commented Jun 22, 2012

...ish regarding merge/rebase

This change allows the user to change the default not to rebase to something there wish (project based).

Always rebase feature branches
git config --global gitflow.feature.rebase true

Always merge feature branches
git config --global gitflow.feature.rebase false

Always rebase feature branches in current Project
git config gitflow.feature.rebase true

Always merge feature branches in current Project
git config gitflow.feature.rebase false

If you've change the default behaivior to rebase and want to merge back, you can pass the -norebase option.

Owner

nvie commented Jul 9, 2012

I think this is more easily tackled with a shell alias.

nvie closed this Jul 9, 2012

salzig commented Jul 9, 2012

How would you alias "git flow feature finish" to "git flow feature finish --rebase"?

Owner

nvie commented Jul 10, 2012

You could either do it in Git:

git config alias.ff 'flow feature finish --rebase'

or in your favourite shell:

alias gff='git flow feature finish --rebase'

salzig commented Jul 10, 2012

sure, nice as shorthand alias, but i prefer the "full" version. btw, with an alias there is no way to define it per project.

+1

Not so much for this particular feature, but for more default configurability. I'd love to be able to have all of my git flow feature finish commands use the -FS (squash and delete remote branch) options by default without having to remember to pass in flags every time.

Shell aliases work, but you already have a git config scope for gitflow.* at your disposal, and the implementation is quite simple. Seems like a no-brainer to me.

Also, this allows for the simple integration of third-party tools

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