Add git-crypt merge driver to support secret files merging (refactored #107) #180
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Will this fix |
|
Any news here? I would love to see this merged but I also have to test it myself. |
|
Couple of years since my last comment on this feature.. Any plan to merge @AGWA? :) For anyone lurking, @jirutka's solution works like a charm - simply compile it, place it in your PATH and |
|
@AGWA This would be incredibly useful, as it addresses a common hinderance to using git-crypt. Is there any chance this could get merged? :) |
|
Maybe someone else can take over maintaining the project, There's 21 pull requests open, and this one is basically an essential feature. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is a refactoring of PR #107. The original PR mixes multiple unrelated changes in a single commit, including some maybe unwanted changes and code-style violations, which is probably the reason why it’s still not merged.
This PR contains only and only the changes needed for the merge driver support with minimum changes to the existing code (separated into an extra commit), so it should be easy for review. I’ve also fixed a few shortcomings in the original PR.