# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1463630315 14400
# Node ID 6dd92510e2bda2b58311e0833fe890067d881329
# Parent  1c684b4c7bd307ff6ee70344d12f755039a093d4
revert to update

diff --git a/.gitconfig b/.gitconfig
--- a/.gitconfig
+++ b/.gitconfig
@@ -20,7 +20,7 @@
 	br      = branch
 	staged  = diff --cached
 	unstage = reset HEAD --
-	fetch   = "!git remote update -p && git rebase --stat @{u}"
+	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}.."
 	new     = "!git log --pretty=onelinecustom $1@{1}..$1@{0}"