On 2/17/2011 1:19 PM, Jakub Narebski wrote: > Paul Menzel <paulepanter@xxxxxxxxxxxxxxxxxxxxx> writes: > > 1. Mark PDF files as binary, if they are not already considered binary. > > 2. Create custom merge driver for PDF files, which would compile > source *.tex file to PDF, provided that TeX is installed, and that > source file itself is not in merge conflict > > 3. Creating pre-commit hook would ensure that you have refershed PDF > files during ordinary commit. Note that this hook is not always ran > (you can force running it with --verify option to git-commit). ?? I only see '--no-verify' in 'git help commit' to bybass the 'pre-commit' hook but not the other way round. Puzzled, Stefan -- ---------------------------------------------------------------- /dev/random says: Beam me up Scotty. This isn't the men's room. -- 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