Messages in this thread | | | Date | Thu, 26 Mar 2015 11:32:17 +1100 | From | Stephen Rothwell <> | Subject | linux-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] | |