# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1485464459 18000
# Node ID c986943c78ff79019f6e2772b5479ad6af0919e2
# Parent  0939aed4427751e850dc2dcc18167d4c2a4753d2
retire git-up

diff --git a/.Gemfile b/.Gemfile
--- a/.Gemfile
+++ b/.Gemfile
@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'git-up'
 gem 'pry'
 gem 'httparty'
 gem 'asciidoctor'
diff --git a/.gitconfig b/.gitconfig
--- a/.gitconfig
+++ b/.gitconfig
@@ -23,6 +23,7 @@
 	br      = branch
 	staged  = diff --cached
 	unstage = reset HEAD --
+	up      = pull --all --prune -r --autostash
 	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}.."