Alex Amiryan wrote: > Online versions of websites are maintained with git > too. I need to have working copy of my remote git repository (online > version of the site) updated by git push (which I do locally). The > problem is that I have some files there (like database config) that have > to be different from local ones and they must not be updated on git > push. My best results so far were with special config branches that are auto-merged in post-receive. As a simple example, post-receive might simply be #!/bin/sh git checkout -f master^0 git merge config -- Thomas Rast trast@{inf,student}.ethz.ch -- 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