Fixing gitconfig and bash_profile

to be compatible with older git version and possibly nonexistent gpg-agent on shared hosting.
11 years ago · b66393945a
parent 1bce27ce8b
commit b66393945a
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
@ -12,7 +12,7 @@
    receivepack = true
 [push]
-	default = simple
+	default = matching
 [color]
    ui = auto