On Thu, Aug 18, 2011 at 09:49:33AM +0200, Sebastian Schuberth wrote: > On Thu, Aug 18, 2011 at 09:23, David Aguilar <davvid@xxxxxxxxx> wrote: > > > Use the predominant conditional style where "then" appears > > alone on the line after the test expression. > > I support your effort to unify the style, but for my personal taste it > has gone the wrong way :-) Even if "then" on its own line was the > predominant style in the merge scripts, I would have voted for putting > all "then" in the same line as "if" as I find this easier to read and > comprehend. But then again it's obvious that such a change would > polarize ;-) > > -- > Sebastian Schuberth I am fine reworking it either way. There's not a specific note about it in Documentation/CodingStyle. If someone wants to make the final call I can patch the docs and rework these patches as needed. Thanks, -- David -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html