Jupytext (https://github.com/mwouts/jupytext) solves most of the problems with managing notebooks in git.