[zeromq-dev] merge commits in libzmq clutter the commit space.
Laurent Alebarde
l.alebarde at free.fr
Fri Dec 6 22:06:46 CET 2013
cf here also : http://nvie.com/posts/a-successful-git-branching-model/
But libzmq does not use branches, so it does not apply.
Le 06/12/2013 20:11, Trevor Bernard a écrit :
>>> I personally like having a no fast forward merge.
>> I've no idea what that means... could you explain?
> Lets say you are merging in a branch "B" into "A". If "A" is directly
> upstream from "B" git will just move the branch "A" onto "B". This is
> a "Fast forward". Pull requests are a non fast forward merge. There is
> an explicit merge commit saying you are merging "B" onto "A". I like
> these sorts of commits.
> _______________________________________________
> zeromq-dev mailing list
> zeromq-dev at lists.zeromq.org
> http://lists.zeromq.org/mailman/listinfo/zeromq-dev
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.zeromq.org/pipermail/zeromq-dev/attachments/20131206/8fe7615e/attachment.htm>
More information about the zeromq-dev
mailing list