revert to update

Wed, 18 May 2016 23:58:35 -0400

author
Meredith Howard <mhoward@roomag.org>
date
Wed, 18 May 2016 23:58:35 -0400
changeset 310
6dd92510e2bd
parent 309
1c684b4c7bd3
child 311
1912a7c57deb

revert to update

.gitconfig file | annotate | diff | comparison | revisions
--- 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}"

mercurial