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

Add git-crypt merge driver to support secret files merging. #107

Closed
wants to merge 2 commits into from
Closed

Add git-crypt merge driver to support secret files merging. #107

wants to merge 2 commits into from

Commits on Jan 23, 2017

  1. Change clean method to only operate on non-encrypted files, as recomm… 

    …anded by git .gitattribute documentation. Add git-crypt merge driver to support secret files merging.
    Shlomo Shachar committed Jan 23, 2017
    Configuration menu
    Copy the full SHA
    815900f View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2017

  1. Fix git crypt merge when multiple keys are configured.

    Shlomo Shachar committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    7a23105 View commit details
    Browse the repository at this point in the history