[IPython-dev] Flatten notebooks for git diff

[Filipe Pires Alvarenga Fernandes]

Wonderful!  Now I can throw away all my horrible hacks and work around to
do exactly that.

Thanks!

-Filipe


On Sat, Sep 6, 2014 at 6:57 PM, Thomas Kluyver <takowl at gmail.com> wrote:

> The notebook document format makes diffing and merging in version control
> awkward. http://nbdiff.org/ is one attempt to address this by doing rich
> diffs in the web browser.
>
> I've made a simpler approach to diffing only - an nbflatten tool that can
> be integrated with git diff to display a simplified version of the diff. It
> discards some information, like metadata and rich output, but the flattened
> diffs are easier to read for simple changes. The script, and installation
> instructions, are in a gist:
>
> https://gist.github.com/takluyver/bc8f3275c7d34abb68bf
>
> This is a very quick hack. Feel free to improve it or work it into bigger
> things.
>
> Thanks,
> Thomas
>
> _______________________________________________
> IPython-dev mailing list
> IPython-dev at scipy.org
> http://mail.scipy.org/mailman/listinfo/ipython-dev
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/ipython-dev/attachments/20140907/d9bbe38b/attachment.html>