Daniel Barkalow <barkalow@xxxxxxxxxxxx> writes: > $ git checkout branch > Warning: xt_CONNMARK.c conflicts with xt_connmark.c; not checking it out > $ git checkout xt_CONNMARK.c --as xt_CONNMARK_caps.c > $ edit xt_CONNMARK_caps.c > $ git add xt_CONNMARK_caps.c Heh, I like that very much. - 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
