You know, resolving some conflicts...

2013-12-28 12:39:39 -05:00 · 2013-12-28 12:39:39 -05:00 · 507145b0db
commit 507145b0db
parent 3bd64cb384
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -68,7 +68,7 @@ _bash_profile_main() {
    _source_bash_extras

    get_ssh_agent
-    get_gpg_agent
+    which gpg-agent && test -d ~/.gnupg && get_gpg_agent

    #_source_if_exists "$HOME/.gvm/scripts/gvm"
    #_source_if_exists "$HOME/.gvmrc"
--- a/2
+++ b/2
@ -16,7 +16,7 @@
 	receivepack = true

 [push]
-	default = tracking
+	default = matching

 [color]
 	ui = auto