From b7c9593cf690724e1f1fc4c1e566e8c405b32898 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Thu, 4 Oct 2018 20:18:12 -0400
Subject: [PATCH] better "git up" alias

the old one caused problems with non-tracked branches
---
 home/.gitconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/.gitconfig b/home/.gitconfig
index 09870b5..97972ba 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -12,7 +12,7 @@
   st = status -s
 	smu = submodule update --init --recursive
 	ignore = "!gi() { curl -L -s https://www.gitignore.io/api/$@ ;}; gi"
-	up = !git fetch && git rebase --autostash FETCH_HEAD
+	up = pull --rebase --autostash
 [github]
 	user = walkah
 [git-up "bundler"]