.gitconfig

changeset 489
ba71ed414be4
parent 488
c986943c78ff
child 491
22a04cc90ff9
--- a/.gitconfig
+++ b/.gitconfig
@@ -23,7 +23,7 @@
 	br      = branch
 	staged  = diff --cached
 	unstage = reset HEAD --
-	up      = pull --all --prune -r --autostash
+	up      = pull -r --all --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}.."

mercurial