diff --git a/bin/git_set_upstream b/bin/git_set_upstream
new file mode 100755
index 0000000..553f3c8
--- /dev/null
+++ b/bin/git_set_upstream
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# Copied from David Pedersen: https://github.com/davidpdrsn/dotfiles/blob/master/bin/git-pp
+
+set -e
+
+git_branch_name() {
+  val=$( git branch 2>/dev/null | grep '^\*' | colrm 1 2 )
+  echo "$val"
+}
+
+git push --set-upstream origin "$(git_branch_name)"
diff --git a/fish.configlink/functions/abbrs.fish b/fish.configlink/functions/abbrs.fish
index 20abe91..8e42bfd 100644
--- a/fish.configlink/functions/abbrs.fish
+++ b/fish.configlink/functions/abbrs.fish
@@ -30,7 +30,7 @@ function abbrs --description 'All abbreviations'
     abbr -a gca 'git commit --amend'
     abbr -a gu 'git pull'
     abbr -a gp 'git push'
-    abbr -a gpp git push --set-upstream origin (git branch 2>/dev/null | grep '^\*' | colrm 1 2)
+    abbr -a gpp 'git_set_upstream'
     abbr -a gl 'git log --graph --decorate --oneline -20'
     abbr -a gll 'git log --graph --decorate --oneline'
     abbr -a gco 'git checkout'
@@ -43,7 +43,7 @@ function abbrs --description 'All abbreviations'
     abbr -a grh 'git reset --hard'
     abbr -a gm 'git merge'
     abbr -a gcp 'git cherry-pick'
-    abbr -a cdg cd (git rev-parse --show-toplevel)
+    abbr -a cdg 'cd (git rev-parse --show-toplevel)'
 
     # GitHub
     abbr -a ghr 'gh repo view -w'