On Tuesday 18 January 2011, Ralf Wildenhues wrote: > * Stefano Lattarini wrote on Mon, Jan 17, 2011 at 10:47:04PM CET: > > On Monday 17 January 2011, Ralf Wildenhues wrote: > > > * Stefano Lattarini wrote on Mon, Jan 17, 2011 at 01:39:29AM CET: > > > > BTW, I'd also add to the ChangeLog entry the "git describe" output > > > > for the commit where I messed things up (if I'm not mistaken, it > > > > should be `v1.11-622-gf90a06c'). > > > > > > Done, and committed right on top of that commit. > > > > > IMHO it would been better to merge the patch into the > > 'warns-win-over-strictness' > > branch, and then merge it into 'master'. Having missed that, we should at > > least > > merge the patch into 'warns-win-over-strictness', no? > > Sure, feel free to do that. > I've done that, and then also merged 'warns-win-over-strictness' back into master, for completeness -- it should basically be a no-op after all, as git said:
$ git merge warns-win-over-strictness Already up-to-date! Merge made by recursive. Regards, Stefano
