Re: linux-next: unnecessary merge in the v4l-dvb tree
- Date: Mon, 12 Feb 2018 13:37:04 -0800
- From: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
- Subject: Re: linux-next: unnecessary merge in the v4l-dvb tree
On Mon, Feb 12, 2018 at 1:15 PM, Linus Torvalds
> The reasoning is to avoid losing the signature from the tag (when
> merging a signed tag, the signature gets inserted into the merge
> commit itself - use "git log --show-signature" to see them).
I think the commit that actually introduced the behavior was
fab47d057: merge: force edit and no-ff mode when merging a tag object
back in 2011, so we've had this behavior for a long time. So it's
probably not be worth tweaking the behavior any more, and maybe we
need to educate people to not update to other peoples state with "git
Maybe we could just tell people to have something like
git config --global alias.update pull --ff-only
and use that for "try to update to upstream".