[vlc-devel] [vlc-commits] Merge branch 'smf-seek'
remi at remlab.net
Fri Jul 11 10:05:56 CEST 2014
Le 2014-07-10 20:54, Jean-Baptiste Kempf a écrit :
> On 10 Jul, Rémi Denis-Courmont wrote :
>> vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu
>> Jul 10 20:51:15 2014 +0300| [abb3237e150974a1d3b772b7a5458d3d2e028124]
>> | committer: Rémi Denis-Courmont
>> Merge branch 'smf-seek'
> Do we do merge commits now?
What do you mean by "now"?
The only thing I recall about merge commits is:
1/ Do not leave unusable repository URLs in them.
2/ Do not use them when it makes no sense (e.g. merging one or two
commits to a sole branch).
This is neither.
It's much easier to merge than to cherry-pick a lot of commits, when
you know how to use git anyway.
More information about the vlc-devel