linux-next: unnecessary merge in the ubifs tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxxxxxxxx

Attachment: pgpxIz8c7VXOq.pgp
Description: OpenPGP digital signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux