Wednesday, October 20, 2010

LaTeX and git


Some of you may remember our discussion at dinner about using git/SVN with LaTeX documents. One of the problems that was mentioned was line-based diff - whenever the formatting of the paragraph changes all of the lines are marked as modified, even if the content did not change.

* git diff --color-words

I found very nice solution to the problem: in git diff you can use the option --color-words which performs word-based diff and highlights the changes in colors.

* gitattributes

You can also put the following line into your .gitattributes file:

*.tex diff=tex

which treats some tags (likes \section{}) as separate words even if there is no whitespace in between.

I am almost converted to git - thanks for opening my eyes ;)



Wednesday, October 6, 2010

PyAS - nuggets

PyAS - Nuggets

Ipython cpaste magic func to paste in code.

cython -a -> annotated html with colours for how long things take ... click to expand

Tuesday, October 5, 2010

Git & github getting started

Global setup:

Download and install Git
git config --global "Your Name"
git config --global

Next steps:

mkdir test
cd test
git init
touch README
git add README
git commit -m 'first commit'
git remote add origin
git push origin master

Existing Git Repo?

cd existing_git_repo
git remote add origin
git push origin master

Importing a Subversion Repo?

Click here

When you're done:


Friday, October 1, 2010

Emacs tricks: cua-mode


You cut some code from a website and it has a few columns of junk at the front, enter cua-mode

M-x cua-mode

Set marker, C-RET enters column mode. Select the block, C-x to cut.