4 Commits

Author	SHA1	Message	Date
Joey Hess	9d975e9ee4	add --merge	2014-11-23 18:48:52 -04:00
Joey Hess	e4f9df8404	avoid configuring git signing key when there's no secret key ... Also, nice display for --add-key steps	2014-11-11 13:41:25 -04:00
Joey Hess	7ea0f460e6	use --trust-model always to avoid prompt from gpg ... gpg prompts when encrypting to an untrusted key, but if propellor has been told to add a key, we implicitly trust it.	2014-11-11 13:26:31 -04:00
Joey Hess	84304821be	propellor spin	2014-11-11 12:58:53 -04:00