Mercurial > hg > mhoward > dotfiles / changeset

--- a/.Gemfile
+++ b/.Gemfile
@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'git-up'
 gem 'pry'
 gem 'httparty'
 gem 'asciidoctor'

--- 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}.."