From ca57f33713ad4b466668f214445abe5ab5a771f5 Mon Sep 17 00:00:00 2001
From: Robert Günzler <r@gnzler.io>
Date: Tue, 2 Nov 2021 18:07:16 +0100
Subject: git: update config

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

(limited to '.config/git')

diff --git a/.config/git/config b/.config/git/config
index 1c59b7c..6e5cf1f 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -91,6 +91,8 @@
     pr = "!f() { git fetch -fu ${2:-origin} refs/pull/${1:?missing pr num}/head:pr/$1 && git checkout pr/$1; }; f"
     total-lines = "! git ls-tree -r master --name-only | xargs -I {} git blame --line-porcelain {} | sed -n 's/^author //p' | sort | uniq -c | sort -rn"
     fixup = "!f() { git commit --fixup=${1}; }; f"
+    fix = fixup
+    fixupf = "!f() { git commit --fixup=${1} && git rebase --autosquash --interactive ${1}^; }; f"
     squash = "!f() { git commit --squash=${1}; }; f"
     r = rebase
     ri = rebase --autosquash -i
@@ -109,7 +111,6 @@
     l = !fzfez git-log
     t = !fzfez git-tags
 
-
 [apply]
     # Detect whitespace errors when applying a patch
     whitespace = fix
-- 
cgit 1.4.1