From 507145b0db2225a5ac5f6bcb1414dc81e75dabca Mon Sep 17 00:00:00 2001
From: Dan Buch <dan@meatballhat.com>
Date: Sat, 28 Dec 2013 12:39:39 -0500
Subject: [PATCH] You know, resolving some conflicts...

---
 bash_profile | 2 +-
 gitconfig    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bash_profile b/bash_profile
index 148634f..f45010d 100644
--- a/bash_profile
+++ b/bash_profile
@@ -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"
diff --git a/gitconfig b/gitconfig
index 7ca511f..19c9aeb 100644
--- a/gitconfig
+++ b/gitconfig
@@ -16,7 +16,7 @@
 	receivepack = true
 
 [push]
-	default = tracking
+	default = matching
 
 [color]
 	ui = auto