Christopher Grim bookest
Linerre
/ Setting $PATH for zsh on macOS.md
Last active
April 29, 2025 08:51
Properly setting $PATH for zsh on macOS (fighting with path_helper)
ewa
/ pgp-merge-drv
Created
April 24, 2012 15:10
Git merge driver to decrypt (and re-encrypt) files before merging.
This file contains hidden or 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
| #!/bin/bash | |
| # WARNING: This creates and manipulates clear text copies of the | |
| # encrypted files. It tries to clean up afterwards, but lots can go | |
| # wrong. If you are seriously worried about the secrecy of the files, | |
| # don't trust this! | |
| ANCESTOR=$1 | |
| MINE=$2 | |
| OTHER=$3 |