From 7f0657e3b7496d2cb8b527b08fb3d9712af57b5f Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Sat, 20 Mar 2021 17:53:38 +0100
Subject: [PATCH] remove hist alias in fish, add to .gitconfig, add git pfusch

---
 .config/fish/config.fish |  1 -
 .gitconfig               | 21 ++++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index dd9ab40..3cdab5b 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -14,7 +14,6 @@ alias gm='git checkout main && git pull --all'
 alias gs='git status --short'
 alias gd='git diff'
 alias gdc='git diff --cached'
-alias hist='git log --pretty --oneline'
 alias l='ls -lAh'
 alias please='sudo'
 
diff --git a/.gitconfig b/.gitconfig
index 323d784..67f0ba4 100755
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,20 +1,23 @@
 [user]
-  name = Franziska Kunsmann
-  email = hi@kunsmann.eu
-  signingkey = 5FE37FF3C981A9146C3805324205EF53ECE0D2BC
+    name = Franziska Kunsmann
+    email = hi@kunsmann.eu
+    signingkey = 5FE37FF3C981A9146C3805324205EF53ECE0D2BC
 
 [commit]
-  gpgsign = true
+    gpgsign = true
 
 [alias]
-  tree = log --all --graph --decorate --oneline
-  logs = log --show-signature
+    hist = log --graph --abbrev-commit --decorate --format=format:'%C(red)%h%C(reset) - %C(green)(%ar)%C(reset) %C(reset)%s %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' -32
+    logs = log --show-signature
+    pfusch = push --force-with-lease
 
 [pager]
-  branch = false
-  config = false
-  stash = false
+    branch = false
+    config = false
+    stash = false
+
 [pull]
     ff = only
+
 [init]
     defaultBranch = main