.gitconfig: Add `m` alias to merge branches keeping historical existence of the merged branch #172

Closed
wants to merge 1 commit into
from

Conversation

Projects
None yet
2 participants
Contributor

gabrielizaias commented Jan 17, 2013

I often find myself not wanting to fast forward the merged branches and I think it could be an useful addition.

More info about using the --no-ff flag from A successful Git branching model by @nvie

The --no-ff flag causes the merge to always create a new commit object, even if the merge could be performed with a fast-forward. This avoids losing information about the historical existence of a feature branch and groups together all commits that together added the feature. Compare:

merge-without-ff

Please, review.

gabrielizaias deleted the gabrielizaias:merge branch Apr 22, 2013

Owner

mathiasbynens commented Apr 22, 2013

Thanks for the suggestion, but I don’t need this often enough to justify having an alias for it.

Contributor

gabrielizaias commented Apr 22, 2013

It's alright, I realized that it might not be justified to merge. But #170 will help someone someday.

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