From 9209b7ce4a385e7355aabe67445fddea2efdff57 Mon Sep 17 00:00:00 2001
From: Noah Petherbridge <root@kirsle.net>
Date: Wed, 8 Oct 2014 19:01:51 +0000
Subject: [PATCH] Git version fixes

---
 home/.bashrc    | 11 +++++++++++
 home/.gitconfig |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/home/.bashrc b/home/.bashrc
index 97aac0a..598d292 100644
--- a/home/.bashrc
+++ b/home/.bashrc
@@ -92,6 +92,17 @@ function title {
 	PROMPT_COMMAND="echo -en \"\033]0;$1\007\""
 }
 
+# Custom git command that overrides $PATH settings
+function git {
+	if [ -x "/usr/local/bin/git" ]; then
+		/usr/local/bin/git $@
+	elif [ -x "/usr/bin/git" ]; then
+		/usr/bin/git $@
+	else
+		echo "git isn't installed"
+	fi
+}
+
 # Case-insensitive searching.
 shopt -s nocaseglob
 
diff --git a/home/.gitconfig b/home/.gitconfig
index 6fea59d..96fa845 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -19,4 +19,4 @@
 	branch = auto
 
 [push]
-	default = matching
+	default = simple