From b8f48517cdd2f23cbbdacac615a4c4a2c4ceb021 Mon Sep 17 00:00:00 2001
From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com>
Date: Mon, 1 Jul 2024 21:00:28 +0200
Subject: [PATCH] autosq

---
 home-manager/git.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/home-manager/git.nix b/home-manager/git.nix
index 3f109b9..f898cc5 100644
--- a/home-manager/git.nix
+++ b/home-manager/git.nix
@@ -11,10 +11,11 @@
       rc = "rebase --continue";
       ra = "rebase --abort";
       # complex renames
-      # TODO: use git-revise
       hardupdate = "!git fetch && git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\"";
       fpush = "push --force-with-lease";
       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\"";
       sw = "!git checkout $(git branch --format \"%(refname:lstrip=2)\" | ${lib.getExe' pkgs.fzf "fzf"})";
     };