You can combine git and latexdiff (plus latexpand if needed) in a single command using git-latexdiff (e.g. On the other hand, if you need to look at the diff of your formatted output, use latexdiff which is an excellent utility (written in perl) that takes two latex files and produces a neat diffed output in pdf like this ( image source):
See the documentation for more details and also Showing which files have changed between two revisions. To see the difference between two arbitrary commits (versions), you can do so with the shas of each of the commits. If you need to look at the code diff, use Git's native diff. However, I must emphasize that splitting into separate lines is a much better option (I only mentioned it in passing in that answer), as I've found it to result in very minimal merge conflicts. One solution is to use git diff -color-words (see my answer to a similar question How to use Mercurial for version control of text documents? where I show an example). However, in git, changes to a single word in a paragraph get recorded as a change to the entire paragraph. When you write documents in LaTeX, you often think in terms of paragraphs and write it as a free flowing document. Git was written to version control source code, where each line is distinct and has a specific purpose. The first step in efficiently managing a Git+LaTeX workflow is to make a few changes to your LaTeX habits.įor starters, write each sentence on a separate line.
0 kommentar(er)
