News for hackers. Stuff that matters.
Re:US Constitution – A Git repo with history of edits by user5994461 on Wednesday October 23, 2019 @06:38PM (#21339812)
Word documents work well in version control. In case you're not aware, you can store word documents and do a diff between any 2 versions over git/svn on windows, it opens the diff view in Word.
Re:US Constitution – A Git repo with history of edits by paulddraper on Wednesday October 23, 2019 @08:27PM (#21340498)
You can store and diff them, but not merge them.

It's basically the same as using Word's own history features.

Re:US Constitution – A Git repo with history of edits by zeven7 on Wednesday October 23, 2019 @07:06PM (#21340007)
Wow, this is going to be very helpful for me. I had no idea. Thanks! So if I install git on Windows and do `git diff MyWordDoc.docx` in the command prompt it'll open up Word?
Re:US Constitution – A Git repo with history of edits by testvox on Wednesday October 23, 2019 @08:03PM (#21340335)
> You can also use the Git attributes functionality to effectively diff binary files. You do this by telling Git how to convert your binary data to a text format that can be compared via the normal diff.

First, you’ll use this technique to solve one of the most annoying problems known to humanity: version-controlling Microsoft Word documents. Everyone knows that Word is the most horrific editor around, but oddly, everyone still uses it.

...Now Git knows that if it tries to do a diff between two snapshots, and any of the files end in .docx, it should run those files through the “word” filter, which is defined as the docx2txt program. This effectively makes nice text-based versions of your Word files before attempting to diff them.

https://git-scm.com/book/en/v2/Customizing-Git-Git-Attribute...

Re:US Constitution – A Git repo with history of edits by user5994461 on Wednesday October 23, 2019 @08:23PM (#21340475)
I am using Tortoise. Not sure about the command line.