lkml.org 
[lkml]   [2015]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: unnecessary merge in the ubifs tree
Hi Artem,

I noticed merge commit 3527a86b7ae1 ("Merge tag 'v4.0-rc5' into
linux-next"). Just a note that if you had merged the commit that the
tag points to, you would have just had a fast forward instead of a
"real" merge. Merging the tag forces the --no-ff flag on git merge
(and adding --ff does not change that). You could have merged
"v4.0-rc5^0" (I think) or (apparently) pass --ff-only to get the fast
forward.

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2015-03-26 01:41    [W:0.065 / U:0.912 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site