diff --git a/functions/git.zsh b/functions/git.zsh
index f73e2a6..cee5a67 100644
--- a/functions/git.zsh
+++ b/functions/git.zsh
@@ -75,7 +75,14 @@ function git-show-changes(){
   git log --reverse HEAD^..
 }
 
-unalias gco
+# oh-my-zsh has some aliases which we might want to override
+# with functions
+function _disable_alias() {
+  [[ -n $(alias "$1") ]] && unalias "$1"
+
+}
+
+_disable_alias gco
 function gco() {
     if [[ "$#" -ge 1 ]]; then
         g checkout $@
@@ -85,7 +92,8 @@ function gco() {
 
 }
 
-unalias gcor
+
+_disable_alias gcor
 function gcor() {
     if [[ "$#" -ge 1 ]]; then
         g checkout $@
@@ -95,7 +103,7 @@ function gcor() {
 
 }
 
-unalias gbd
+_disable_alias gbd
 function gbd() {
     if [[ "$#" -ge 1 ]]; then
         g branch -d $@
@@ -105,7 +113,7 @@ function gbd() {
 }
 
 
-unalias gbD
+_disable_alias gbD
 function gbD() {
     if [[ "$#" -ge 1 ]]; then
         g branch -D $@
@@ -113,4 +121,3 @@ function gbD() {
         g branch -D $(gb | fzf -m)
     fi
 }
-