From: Artem Bityutskiy <dedekind1@gmail•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: unnecessary merge in the ubifs tree
Date: Thu, 26 Mar 2015 09:13:11 +0200 [thread overview]
Message-ID: <1427353991.30360.87.camel@sauron.fi.intel.com> (raw)
In-Reply-To: <20150326113217.580fe7e8@canb.auug.org.au>
On Thu, 2015-03-26 at 11:32 +1100, Stephen Rothwell wrote:
> 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.
You are right, and thank you for telling about this. I hope Linus won't
flame me for this. I'll definitely keep this in mind next time.
Artem.
prev parent reply other threads:[~2015-03-26 7:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-26 0:32 linux-next: unnecessary merge in the ubifs tree Stephen Rothwell
2015-03-26 7:13 ` Artem Bityutskiy [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1427353991.30360.87.camel@sauron.fi.intel.com \
--to=dedekind1@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox