On 07/27/2011 10:02 PM, Junio C Hamano wrote: > Michael Haggerty <mhagger@xxxxxxxxxxxx> writes: >> diff --git a/attr.c b/attr.c >> ... >> +char *git_attr_name(struct git_attr *attr) { >> + return attr->name; >> +} > > (Style) > > char *git_attr_name(struct git_attr *attr) > { > return attr->name; > } Thanks. I will include this in the next version of the patch series. >> diff --git a/attr.h b/attr.h >> ... >> +/* >> + * Return the name of the attribute represented by the argument. The >> + * return value is a pointer to a null-delimited string that is part >> + * of the internal data structure; it should not be modified or freed. >> + */ > > should not be modified NOR freed? No, usually "nor" is only used with "neither". I'm confident that the wording that I used is correct [1]. Alternatively, one could write "should be neither modified nor freed". Michael [1] See, e.g., http://grammar.quickanddirtytips.com/when-to-use-nor.aspx section "When to Use “Or” Instead of “Nor”". -- Michael Haggerty mhagger@xxxxxxxxxxxx http://softwareswirl.blogspot.com/ -- 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