lkml.org 
[lkml]   [2014]   [Oct]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: unnecessary merges in the v4l-dvb tree
Hi Mauro,

I noticed that you have two unnecessary merges in the v4l-dvb tree
(git://linuxtv.org/mchehab/media-next.git#master). This is not
entirely your fault. Unfortunately, when you do

git merge <signed tag>

git will produce a merge commit even if it could have fast
forwarded :-(. Consequently, you have commits 1ef24960ab78 ("Merge tag
'v3.18-rc1' into patchwork") and d6d41ba1cb38 ("Merge remote-tracking
branch 'linus/master' into patchwork") even though the patchwork branch
in each case is included in the tag being merged.

The only ways I know around this is to either merge the commit
associated with the tag or do a (hard) reset to the tag.

Linus, any thoughts?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2014-10-30 00:01    [W:2.059 / U:0.036 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site