nvie/gitflow — pull request #226 by Salzig (2012-06-22 13:42:24+00:00)
Title: add config option to change the default behavior of git flow feature fin...

...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 -nor (no rebase) option.