[vlc-devel] commit: Merge branch 'df-for-upstream' of git://repo.or.cz/vlc/ davidf-public (Derk-Jan Hartman )

[Pierre d'Herbemont]

On Aug 1, 2008, at 10:50 AM, Pavlov Konstantin wrote:

> On Fri, Aug 01, 2008 at 10:20:25AM +0200, Pierre d'Herbemont wrote:
>>
>> On Aug 1, 2008, at 7:49 AM, Pavlov Konstantin wrote:
>>
>>> On Fri, Aug 01, 2008 at 12:39:19AM +0200, git version control wrote:
>>>> vlc | branch: master | Derk-Jan Hartman <hartman at videolan.org> |
>>>> Fri Aug  1 00:41:33 2008 +0200|
>>>> [35824733e305214dfada18dd6362cfa02a86dcd3]
>>>>
>>>> Merge branch 'df-for-upstream' of git://repo.or.cz/vlc/davidf- 
>>>> public
>>>
>>> I think it's generally better to do something like:
>>>
>>> $ git fetch git://repo.or.cz/vlc/davidf-public master:master-- 
>>> davidf-
>>> public
>>>
>>> $ git cherry-pick -n needed-revision
>>>
>>> $ git commit -c -s
>>>
>>> Well, of course it is only handy when there are a couple of commits
>>> in a
>>> fetched tree.
>>
>> Why? git pull is simple enough... (I added the committer line to the
>> commit mail now)
>
> Only to avoid merges.

:) Merges are the whole point of git. Though, I do agree with you on  
the fact that committers should avoid merge object between there local  
tree and the git.v.o tree, I really prefer merges with public branches  
to be marked as is.

Pierre.