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 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 email@example.com . 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).
I'm using SourceTree 22.214.171.124 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.
Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot