2014 LinuxQuestions.org Members Choice AwardsThis forum is for the 2014 LinuxQuestions.org Members Choice Awards.
You can now vote for your favorite products of 2014. This is your chance to be heard! Voting ends on February 3rd.
Notices
Welcome to LinuxQuestions.org, a friendly and active Linux Community.
You are currently viewing LQ as a guest. By joining our community you will have the ability to post topics, receive our newsletter, use the advanced search, subscribe to threads and access many other special features. Registration is quick, simple and absolutely free. Join our community today!
Note that registered members see fewer ads, and ContentLink is completely disabled once you log in.
If you have any problems with the registration process or your account login, please contact us. If you need to reset your password, click here.
Having a problem logging in? Please visit this page to clear all LQ-related cookies.
Get a virtual cloud desktop with the Linux distro that you want in less than five minutes with Shells! With over 10 pre-installed distros to choose from, the worry-free installation life is here! Whether you are a digital nomad or just looking for flexibility, Shells can put your Linux machine on the device that you want to use.
Exclusive for LQ members, get up to 45% off per month. Click here for more info.
View Poll Results: Revision Control System of the Year
Our company migrated from CVS to svn to hg (with git for open embedded projects).
Everybody fled CVS with a deep sigh of relief... Some die hards still cling to svn (well, that "copying is cheap, everything is a copy" paradigm is sort of neat).
Most have moved on to hg. Last time we had a close look, file renames and branch merges were just sooo much smoother in hg than svn)
Curiously enough the "The True Name of a File is it's Contents" approach of git means that file renames and copies and branch merges work very well too.
I enjoy using git on a daily basis for everything I work on. It made my work much more comfortable. The next step will be to store all configs in a single git repository with a separate branch for every machine.
Last edited by average_user; 01-06-2015 at 02:18 PM.
I enjoy using git on a daily basis for everything I work on. It made my work much more comfortable. The next step will be to store all configs in a single git repository with a separate branch for every machine.
Right. I recently got a router because my old one went down. I have SSH set up on port 443 and OpenWRT installed. I am going to create a bare repository on my router and access it from anywhere in the world or use Github for that purpose.
I started to use it [git] for all my documents, including OpenDocument or MSOffice
Quote:
Originally Posted by colonelqubit
Are you using the regular binary ODF formats, or the flat-xml versions?
I use binary ODF format, but have git configured to filter it through odt2txt before diff-ing.
Code:
[diff "ODF"]
textconv = odt2txt
I make the same with MSOffice files (filter through antiword)
This way I have readable diffs in all tools like git gui or gitk, for the price of ignoring most formatting. And the comfort of having all documents under easy version control is priceless
Interesting. I use Latex for writing anything more complicated. I wrote my CV, my master's thesis and several long documents at work using Latex. It works great with git.
One more thing, can you share your experience how reliable antiword is? Does it work well for Word documents with multiple tables? I work in a corporate environment and people will often send complicated Word documents such as proposals, sometimes several times a week with some minor changes. It would be great if I could just generate git diff on them. And I would love to have something similar for Excel files.
Last edited by average_user; 01-17-2015 at 06:58 PM.
One more thing, can you share your experience how reliable antiword is?
It does extract text, which allows to peek inside documents from git tools. Don't expect miracles when diffing tables with complex formatting. Just test it, it's simple. Note, that it does not support docx files. See for example http://stackoverflow.com/questions/5...ocx-files-unix.
I have mixed feelings here. I use Git the most, but have always found Mercurial to be far better designed and more user friendly. I use both from the CLI. I voted for Mercurial.
LinuxQuestions.org is looking for people interested in writing
Editorials, Articles, Reviews, and more. If you'd like to contribute
content, let us know.