Skip to content

Instantly share code, notes, and snippets.

@martijnvermaat
martijnvermaat / userContent.css
Last active August 29, 2015 14:03
Hide comments on Losse Veter (losseveter.nl)
/*
* Hide comments on Losse Veter (losseveter.nl)
*
* Most of the user comments on Losse Veter are either racist or zealot
* epistels about doping. With this Firefox setting, you can enjoy just
* the track and field news.
*
* Edit this file and copy it as userContent.css into your Firefox
* profile-directory/chrome/
*/
@takluyver
takluyver / README.md
Created September 6, 2014 21:44
Flatten notebooks for git diff

Copy nbflatten.py to somewhere on $PATH. Then, in the root of a git repository, run these commands:

echo "*.ipynb diff=ipynb" >> .gitattributes 
git config diff.ipynb.textconv nbflatten.py

When you change a notebook and run git diff, you'll see the diff of flattened, simplified notebooks, rather than the full JSON. This does lose some information (metadata, non-text output), but it makes it easier to see simple changes in the notebook.

This doesn't help with merging conflicting changes in notebooks. For that, see nbdiff.org.