diff --git a/.gitconfig b/.gitconfig index 954c503..e4b1f94 100644 --- a/.gitconfig +++ b/.gitconfig @@ -64,8 +64,8 @@ code-changes = "!git log --format=format: --name-only | egrep -v '^$' | sort | uniq -c | sort -rg | head -10" cc = "!git code-changes" fixup = "commit --fixup" - ri = "rebase -i --autosquash" - up = pull --rebase + ri = "rebase -i --autostash" + up = pull --rebase --autostash [branch] #New branch track remote #autosetupmerge = always