From: Matthieu Moy Date: Fri, 22 Jun 2012 07:57:36 GMT Subject: Re: [PATCH] push: start warning upcoming default change for push.default Message-ID: In-Reply-To: <7vk3z0shri.fsf@alter.siamese.dyndns.org> Junio C Hamano writes: > Matthieu Moy writes: > >> Junio C Hamano writes: >> >>> Re-read the part you omitted with [...]. Doesn't it say something >>> about "only available"? >> >> It does, but it seems you're trying hard to avoid telling the user "you >> should use 'current'", where 'current' is the only reasonable option for >> this user. I still don't understand what problem you're trying to solve. > > I am avoiding to say "you should use simple/current". Choice > between matching and simple/current is for the user to make (mostly > dictated by the project's workflow) and we cannot make a suggestion > better than what user knows. > > Choice between simple and current is mechanically derivable. If the > user also uses older version of git, simple is not an option. I do agree with that. My message tells the user to use 'current' instead of 'simple' when not appropriate, not to use 'current' instead of 'matching', which would indeed be a nonsense. I thought it was clear enough, but we can make that more explicit. How about: (the 'simple' mode was introduced in Git 1.7.11. Use the similar mode 'current' instead of 'simple' if you sometimes use older versions of Git) -- Matthieu Moy http://www-verimag.imag.fr/~moy/