git-process icon indicating copy to clipboard operation
git-process copied to clipboard

Allow merge-bubbles (merge --no-ff) with to-master?

Open orip opened this issue 12 years ago • 1 comments

How about adding a configuration/command-line switch for to-master creating merge bubbles (rebase origin/master && checkout origin/master && merge --no-ff feature-branch && push)?

We really like how they mark all commits done on a feature branch when reviewing the history.

orip avatar Oct 27 '13 09:10 orip

Most teams simply use squashing to consolidate the commits before to-mastering.

The --no-ff in conjunction with rebasing against master approach is interesting. When I've done things like that in the past, the signal/noise ratio from all the merge commits (especially when the result of a feature branch was a small handful of commits) was painfully low. How to you manage to keep that under control?

I'll look into adding it as an option. Of course pull-requests are always welcome... :hatching_chick:

jdigger avatar Oct 28 '13 03:10 jdigger