Re: linux-next: unnecessary merge in the v4l-dvb tree

Linus Torvalds writes: (Summary) I think the commit that actually introduced the behavior was I think the commit that actually introduced the behavior was fab47d057: merge: force edit and no-ff mode when merging a tag object 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 pull".
pull".
Maybe we could just tell people to have something like Maybe we could just tell people to have something like git config --global alias.update pull --ff-only
git config --global alias.update pull --ff-only
and use that for "try to update to upstream".