This commit is contained in:
nora 2024-07-01 21:00:28 +02:00
parent c2ad2db9da
commit b8f48517cd

View file

@ -11,10 +11,11 @@
rc = "rebase --continue"; rc = "rebase --continue";
ra = "rebase --abort"; ra = "rebase --abort";
# complex renames # complex renames
# TODO: use git-revise
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 = "rebase --autosquash -i"; resq = "rebase --autosquash -i";
autosquash = "!${lib.getExe pkgs.git-revise} -i $(git merge-base HEAD origin/HEAD) --autosquash";
autosq = "autosquash";
pfush = "!echo \"hör uf ume z'pfusche und machs richtig\""; pfush = "!echo \"hör uf ume z'pfusche und machs richtig\"";
sw = "!git checkout $(git branch --format \"%(refname:lstrip=2)\" | ${lib.getExe' pkgs.fzf "fzf"})"; sw = "!git checkout $(git branch --format \"%(refname:lstrip=2)\" | ${lib.getExe' pkgs.fzf "fzf"})";
}; };