Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Diffing and merging notebooks #8

Merged
merged 5 commits into from
Mar 8, 2016
Merged

Diffing and merging notebooks #8

merged 5 commits into from
Mar 8, 2016

Commits on Dec 14, 2015

  1. Add JEP notebook-diff.

    Martin Sandve Alnæs committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    71b2467 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2016

  1. Update notebook-diff.md 

    * Provided a high-level description of the diff algorithm approach.
* Updated with the major changes to the diff format that nbdime already implements (mostly copy-paste from current nbdime docs).
* Many smaller updates.
    Martin Sandve Alnæs committed Feb 23, 2016
    Configuration menu
    Copy the full SHA
    afc7615 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from martinal/notebook-diff-v2 

    Update notebook-diff.md
    Martin Sandve Alnæs committed Feb 23, 2016
    Configuration menu
    Copy the full SHA
    48dea94 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2016

  1. add note about displaying metadata

    @minrk
    minrk committed Mar 8, 2016
    Configuration menu
    Copy the full SHA
    c9dcdf6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from minrk/nbdiff 

    add note about displaying metadata
    Martin Sandve Alnæs committed Mar 8, 2016
    Configuration menu
    Copy the full SHA
    7ea2c63 View commit details
    Browse the repository at this point in the history