刚刚遇到的“jupytext”看起来像一个完美的解决方案。它从笔记本生成一个.py文件，然后保持两者同步。您可以通过.py文件进行版本控制、差异和合并输入，而不会丢失输出。当你打开笔记本时，它使用.py作为输入单元格，使用.ipynb作为输出单元格。如果你想在git中包含输出，那么你可以添加ipynb。

https://github.com/mwouts/jupytext

刚刚遇到的“jupytext”看起来像一个完美的解决方案。它从笔记本生成一个.py文件，然后保持两者同步。您可以通过.py文件进行版本控制、差异和合并输入，而不会丢失输出。当你打开笔记本时，它使用.py作为输入单元格，使用.ipynb作为输出单元格。如果你想在git中包含输出，那么你可以添加ipynb。

https://github.com/mwouts/jupytext

这是我的解决方案与git。它允许你像往常一样添加和提交(和diff):这些操作不会改变你的工作树，同时(重新)运行一个笔记本不会改变你的git历史。

虽然这可能适用于其他VSC，但我知道它不能满足您的要求(至少VSC不可知)。不过，它对我来说是完美的，尽管它没有什么特别出色的地方，而且很多人可能已经在使用它了，但我没有通过谷歌找到关于如何实现它的明确说明。所以它可能对其他人有用。

将包含此内容的文件保存在某个位置(对于下面的内容，让我们假设~/bin/ipynb_output_filter.py) (chmod +x ~/bin/ipynb_output_filter.py) 创建文件~/。Gitattributes，包含以下内容 *。ipynb过滤器= dropoutput_ipynb 执行如下命令: Git配置——全局核心。attributesfile ~ / .gitattributes Git配置——global filter.dropoutput_ipynb。干净的~ / bin / ipynb_output_filter.py Git配置——global filter.dropoutput_ipynb。涂抹的猫

完成了!

限制:

it works only with git in git, if you are in branch somebranch and you do git checkout otherbranch; git checkout somebranch, you usually expect the working tree to be unchanged. Here instead you will have lost the output and cells numbering of notebooks whose source differs between the two branches. more in general, the output is not versioned at all, as with Gregory's solution. In order to not just throw it away every time you do anything involving a checkout, the approach could be changed by storing it in separate files (but notice that at the time the above code is run, the commit id is not known!), and possibly versioning them (but notice this would require something more than a git commit notebook_file.ipynb, although it would at least keep git diff notebook_file.ipynb free from base64 garbage). that said, incidentally if you do pull code (i.e. committed by someone else not using this approach) which contains some output, the output is checked out normally. Only the locally produced output is lost.

我的解决方案反映了这样一个事实:我个人不喜欢对生成的东西进行版本控制——注意，涉及输出的合并几乎肯定会使输出或您的生产力无效，或者两者都无效。

编辑:

如果你确实采用了我建议的解决方案——也就是全局的解决方案——你会遇到一些麻烦，比如你想要版本输出的git repo。因此，如果你想禁用特定git存储库的输出过滤，只需在其中创建一个文件.git/info/attributes，使用 **ipynb过滤器=

作为内容。显然，以同样的方式也可以做相反的事情:仅为特定的存储库启用筛选。

代码现在在它自己的git repo中维护 如果上面的指令导致ImportErrors，尝试在脚本路径之前添加"ipython": Git配置——global filter.dropoutput_ipynb。清除ipython ~/bin/ipynb_output_filter.py

编辑:2016年5月(更新于2017年2月):我的脚本有几个替代方案-为了完整性，这里是我知道的列表:nbstripout(其他变体)，nbstrip, jq。

你可以使用这个jupyter扩展。它可以让你直接上传你的ipython笔记本到github。

https://github.com/sat28/githubcommit

我还制作了一个视频来演示这些步骤 youtube链接

正如前面指出的，——脚本在3.x中已弃用。这种方法可以通过应用后保存钩子来使用。特别地，在ipython_notebook_config.py中添加以下内容:

import os
from subprocess import check_call

def post_save(model, os_path, contents_manager):
    """post-save hook for converting notebooks to .py scripts"""
    if model['type'] != 'notebook':
        return # only do this for notebooks
    d, fname = os.path.split(os_path)
    check_call(['ipython', 'nbconvert', '--to', 'script', fname], cwd=d)

c.FileContentsManager.post_save_hook = post_save

代码取自#8009。

(2017-02)

策略

on_commit (): 去掉输出>的名称。Ipynb (nbstripout) 去掉输出> name.clean.ipynb (nbstripout，) 总是nbconvert to python: name.ipynb.py (nbconvert) 始终转换为markdown: name.ipynb.md (nbconvert, ipymd) vcs.configure (): Git difftool, mergetool: nbdiff和nbmerge from nbdime

工具

nbstripout: strip the outputs from a notebook src: https://gist.github.com/minrk/6176788 src: https://github.com/kynan/nbstripout pip install nbstripout; nbstripout install ipynb_output_filter: strip the outputs from a notebook src: https://github.com/toobaz/ipynb_output_filter/blob/master/ipynb_output_filter.py ipymd: convert between {Jupyter, Markdown, O'Reilly Atlas Markdown, OpenDocument, .py} src: https://github.com/rossant/ipymd nbdime: "Tools for diffing and merging of Jupyter notebooks." (2015) src: https://github.com/jupyter/nbdime docs: http://nbdime.readthedocs.io/ nbdiff: compare notebooks in a terminal-friendly way nbdime nbdiff works as a git diff tool: https://nbdime.readthedocs.io/en/latest/#git-integration-quickstart nbmerge: three-way merge of notebooks with automatic conflict resolution nbdime nbmerge works as a git merge tool nbdiff-web: shows you a rich rendered diff of notebooks nbmerge-web: gives you a web-based three-way merge tool for notebooks nbshow: present a single notebook in a terminal-friendly way