I'm using Sourcetree to manage Microsoft Word documents (docx). I understand git/hg/etc. aren't really designed for handling these binary files.
I'd like to have a more usable diff for these documents. I have scripts that do two different kinds of diff:
1. Textual diff that converts the Word docs into plain text and then does a standard diff on them.
2. Visual diff that controls the Word application to produce a composite document from the two that I'm diff'ing.
Both of these scripts work fine from the command line. Can someone help me configure hg and Sourcetree so that the textual diff appears in the Sourcetree GUI and the visual diff is launched by clicking on the "external diff" button?
I really appreciate it and would be willing to share the scripts for others who are interested.
I've had this problem from years (previously I used TortoiseHg which had that solved).
I've recently came across this project in github
which solves this problem both in Sourcetree and on the command line.
- download and extract to a location
- add in the project's .gitattributes the following line
- add in the global .gitconfig the following lines
command = <extraction location>/diff-word-wrapper.cmd
I'm using SourceTree 184.108.40.206 and docx seems to be comparing fine for me on the textual level. It seems to be a recent change because I don't recall previous versions comparing on the text level.
If you paste in images in your Word docx, that is not compared... so the accuracy is limited.
As a side, if I know how to use Markdown with locally referenced images or relative image links, I'd prefer Markdown.
SourceTree installer has improved a lot lately and even the SSH integration is much better. So, I suggest you give it a spin. It seems they've really listened to the feedback and made improvements. I love software companies that listen to customer feedback and make noticeable updates.
I have the same problem here - i've set up diffing word docs accroding to the article at http://blog.martinfenner.org/2014/08/25/using-microsoft-word-with-git/ by putting
in my .gitattributes and adding this section in .git/config:
[diff "pandoc"] textconv=pandoc --to=markdown prompt = false
works fine from the command line, but in SourceTree I get a spinning icon and nothing happens when the diff should be displayed.
@Ansar Rezaei: You have to create a file called .gitattributes (the dot helps make it hidden from normal OS views, but is still there) and put it in the PROJECT's highest level along with the .git folder and usually alongside a .gitignore file. The .gitconfig is at a more global level in your OS. likely your Home Folder, and may already be there with some other stuff in it. Just postpend the code.
@Rob Barrett: Can you please share the code scripts? feel free to email me at firstname.lastname@example.org . Thanks!
I did follow the link Flo mentioned but although it works from the command line for small files it does not for bigger files - and I get the spinning cursor in sourcetree. Could anyone post a complete solution with all the scripts and files necessary. It would be very useful for many of us (just google for git+word).