meta data for this page
  •  

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Next revision		Previous revision
git:diff [2015/11/13 08:33] – created niziakgit:diff [2020/06/03 11:16] (current) – niziak
Line 1: Line 1:
 +====== diff ======
 +
 +
 === Word and LibreOffice documents === === Word and LibreOffice documents ===
 Trick is to convert document into text files and make diff on it. Trick is to convert document into text files and make diff on it.
 <code bash> <code bash>
-sudo apt-get install odt2txt docs2txt+sudo apt-get install odt2txt docx2txt
 git config --global diff.odf.textconv "odt2txt" git config --global diff.odf.textconv "odt2txt"
 git config --global diff.word.textconv "docx2txt" git config --global diff.word.textconv "docx2txt"
Line 9: Line 12:
 Create file ''**~/.config/git/attributes**'' Create file ''**~/.config/git/attributes**''
 and put following lines into it: and put following lines into it:
-<file>+<file | ~/.config/git/attributes>
 *.ods diff=odf *.ods diff=odf
 *.odt diff=odf *.odt diff=odf