fabricebrito

Git-Flow Cheatsheet

References

• Detailed Cheatsheet: http://danielkummer.github.io/git-flow-cheatsheet/
• Command-line Arguments Reference: https://github.com/nvie/gitflow/wiki/Command-Line-Arguments
• git-flow Home: https://github.com/nvie/gitflow

Initialize a Repository for git-flow

fabricebrito

#!/bin/bash

# Source: http://toomuchdata.com/2012/06/25/how-to-install-python-2-7-3-on-centos-6-2/

# Install stuff #
#################

# Install development tools and some misc. necessary packages
yum -y groupinstall "Development tools"
yum -y install zlib-devel  # gen'l reqs

fabricebrito

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.

fabricebrito

"""This script will look for all .ipynb files in source_dir and convert them on the same place to
.rst files.

It is used in order to integrate notebooks output to sphinx documentation.

Read it, use it, hack it and share it ! Or you can do better writing a sphinx extension :-)

:Url:
    https://gist.github.com/hadim/16e29b5848672e2e497c
:Author: