Junio C Hamano <junkio@xxxxxxx> writes: > I am in favor of also using $GIT_DIR/config format even for the > in-tree .gitattributes files. Thinking about this a bit more, I take this "syntax" part back. One-line-per-record format is much nicer if we want to keep this information in .gitattributes files in-tree, especially because the changes to them _could_ conflict, and the pathattr mechanism needs to work with such a file left in the working tree as its input. I suspect the config parser would simply say "oops" and die given a malformed input resulting from conflict markers. It is easy to ignore <<< === >>> lines and we would get a sensible result. Which automatically means that there will be no "continuation lines". - 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