perlancar perlancar
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
| DROP TABLE contacts; | |
| CREATE TABLE contacts ( | |
| contact_id integer NOT NULL PRIMARY KEY, | |
| user_id integer NOT NULL default '0', | |
| changed datetime NOT NULL default '0000-00-00 00:00:00', | |
| del tinyint NOT NULL default '0', | |
| name varchar(128) NOT NULL default '', | |
| email varchar(128) NOT NULL default '', | |
| firstname varchar(128) NOT NULL default '', | |
| surname varchar(128) NOT NULL default '', |
ewa
/ pgp-merge-drv
Created
April 24, 2012 15:10
Git merge driver to decrypt (and re-encrypt) files before merging.
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
| #!/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 |