Re: git merges of tags

2017-05-19 Thread Linus Torvalds
On Thu, May 18, 2017 at 4:23 PM, Stephen Rothwell wrote: > > Just a reminder that if you are merging Linus' tree (or any tree > really) via a tag, git was changed some time ago so that merging a tag > will not do a fast forward (there is a good reason for this - I just >

git merges of tags

2017-05-18 Thread Stephen Rothwell
Hi all, Just a reminder that if you are merging Linus' tree (or any tree really) via a tag, git was changed some time ago so that merging a tag will not do a fast forward (there is a good reason for this - I just can't recall it ATM). This is a problem when your current head of branch has been