====== own diff/mergetool ====== * [[https://stackoverflow.com/questions/48478877/git-merge-with-git-crypt|Git merge with git-crypt]] * [[https://blog.beardhatcode.be/2018/03/your-own-git-mergetool.html|Creating your own git mergetool]] * [[https://bignerdranch.com/blog/git-smudge-and-clean-filters-making-changes-so-you-dont-have-to/|Git Smudge and Clean Filters: Making Changes So You Don’t Have To]] * [[https://git-scm.com/docs/gitattributes|gitattributes]] * [[https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes|8.2 Customizing Git - Git Attributes]]