mirror of
https://github.com/Noratrieb/nixos.git
synced 2026-01-14 19:55:08 +01:00
autosq
This commit is contained in:
parent
c2ad2db9da
commit
b8f48517cd
1 changed files with 2 additions and 1 deletions
|
|
@ -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"})";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue