> But if you then switch to B from that state, F will not even be > modified (i.e. it will keep the contents you prepared for "branch > A's instance of F"). Or: the post-commit hook used in the workaround looks up the prior branch via @{-1}, finds all files common between @ & @{-1} that don't share a latest commit, deletes those files and replaces them singly with the results of git-archive using the latest commits of those files relative to @. ("All files common between @ & @{-1}" would need to be either all non-locally-modified files or making use of git-stash {save,pop} to preserve local modifications.) All this assumes having reversible $Format$ strings, so the clean filter can restore the proper $Format$ string. Might be worth doing just so there's at least 1 accurate and maybe-fast "git rcs keywords substitution using smudge/clean filters" project on github. ;) Otherwise, users of "git-keyword-substitution" and "git-rcs-keywords" are being led astray. -- 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