perlancar perlancar

perlancar / pgp-merge-drv

Created October 9, 2019 05:51 — forked from ewa/pgp-merge-drv

Git merge driver to decrypt (and re-encrypt) files before merging.

	#!/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