From 94fd866e23c089507be1ff4e7e7ce4b0007e323d Mon Sep 17 00:00:00 2001 From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> Date: Sun, 4 Jun 2023 22:02:30 +0200 Subject: [PATCH] simplify git resq --- home-manager/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/home.nix b/home-manager/home.nix index cadd76b..44fde67 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -66,7 +66,7 @@ aliases = { hardupdate = "!git fetch && git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\""; fpush = "push --force-with-lease"; - resq = "!git rebase --autosquash -i $(git merge-base origin/master HEAD)"; + resq = "rebase --autosquash -i"; }; difftastic = { enable = true;