# HG changeset patch # User Meredith Howard # Date 1639422166 21600 # Node ID 68baaab84a0c814643acf361c6add194574b9761 # Parent 4921edc4b51845d37ce8112a930ec7315e9a95ba Make git-histedit an alias. can use --keep-base after 2.24 diff --git a/.gitconfig b/.gitconfig --- a/.gitconfig +++ b/.gitconfig @@ -21,6 +21,7 @@ staged = diff --cached unstage = reset HEAD -- rollback = reset --soft ^HEAD + histedit = rebase -i --autosquash --onto @{u}... @{u} pushf = push --force-with-lease up = pull -r --prune update = "!git remote update -p && git merge --ff-only --stat @{u}"