simplify git resq

This commit is contained in:
nora 2023-06-04 22:02:30 +02:00
parent e44eed1620
commit 94fd866e23

View file

@ -66,7 +66,7 @@
aliases = { aliases = {
hardupdate = "!git fetch && git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\""; hardupdate = "!git fetch && git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\"";
fpush = "push --force-with-lease"; fpush = "push --force-with-lease";
resq = "!git rebase --autosquash -i $(git merge-base origin/master HEAD)"; resq = "rebase --autosquash -i";
}; };
difftastic = { difftastic = {
enable = true; enable = true;