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.

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

Fix pretty-print diff filtering for added/removed cells etc. #305

Merged
merged 1 commit into from
Oct 25, 2017

Conversation

vidartf
Copy link
Collaborator

@vidartf vidartf commented Oct 24, 2017

Overhauls the pretty-print system in order to filter diffs properly according to ignore flags to diff. Also adds the -d/--details flag to nbdiff for filtering similar to what is available in nbshow.

Possible breaking change in CLI arguments: Removed the -d short-hand for --decisions to nbmerge, as it now conflicts with the --details flag's short-hand for diff filtering.

Note that the filtering is still not fully applied for nbdiff-web, which should probably be solved in a different PR.

Fixes #303.

@vidartf vidartf mentioned this pull request Oct 24, 2017
@minrk minrk merged commit a489683 into jupyter:master Oct 25, 2017
@vidartf vidartf deleted the fix-filter branch October 25, 2017 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants