# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1485540005 18000
# Node ID 22a04cc90ff936a6948431ba95250f0ad4cbb65d
# Parent  ad833184063c3cc6804b743384f3e07c68a787f1
skip --all, confuses rebase later

diff --git a/.gitconfig b/.gitconfig
--- a/.gitconfig
+++ b/.gitconfig
@@ -23,7 +23,7 @@
 	br      = branch
 	staged  = diff --cached
 	unstage = reset HEAD --
-	up      = pull -r --all --prune
+	up      = pull -r --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}.."