# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1485484406 18000
# Node ID ba71ed414be4057f323f3cf6d05246bf7a8e3742
# Parent  c986943c78ff79019f6e2772b5479ad6af0919e2
no autostash

diff --git a/.gitconfig b/.gitconfig
--- a/.gitconfig
+++ b/.gitconfig
@@ -23,7 +23,7 @@
 	br      = branch
 	staged  = diff --cached
 	unstage = reset HEAD --
-	up      = pull --all --prune -r --autostash
+	up      = pull -r --all --prune
 	update  = "!git remote update -p && git merge --ff-only --stat @{u}"
 	in      = "!git remote update -p; git log --pretty=onelinecustom ..@{u}"
 	out     = "!git log --pretty=onelinecustom @{u}.."