# HG changeset patch # User Meredith Howard # Date 1491451430 14400 # Node ID c51f6fc7c727a123dc0f41f2a64c09d12a521c96 # Parent 911b3929f162a9d2e3710a1144cbb3ac2eabf354 add rollback, more hg riffs! diff --git a/.gitconfig b/.gitconfig --- a/.gitconfig +++ b/.gitconfig @@ -27,6 +27,7 @@ br = branch staged = diff --cached unstage = reset HEAD -- + rollback = reset --soft ^HEAD up = pull -r --prune update = "!git remote update -p && git merge --ff-only --stat @{u}" in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}"