From 6144359cbd9093bffbe805b0520564cd4f4e048d Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Wed, 5 May 2021 08:47:29 +0200
Subject: [PATCH] config/git: update status shortcuts

---
 .config/git/config                            | 10 +++---
 .config/git/git-bugreport-2021-02-13-2112.txt | 32 +++++++++++++++++++
 .local/bin/scripts/git-st                     |  2 --
 3 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 .config/git/git-bugreport-2021-02-13-2112.txt
 delete mode 100755 .local/bin/scripts/git-st

diff --git a/.config/git/config b/.config/git/config
index 40a975f..828a8d7 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -68,7 +68,9 @@
 
 [alias]
 	# GET INFO
-	stb = status --short --branch --show-stash
+	s = !git stl && git stb
+	st = stb .
+	stb = status --short --branch
 	stv = --paginate status -v
 	stvv = --paginate status -vv
 
@@ -77,7 +79,7 @@
 	ba = b -a
 	main = !cat $(git rev-parse --git-dir)/refs/remotes/origin/HEAD | cut -d'/' -f4
 
-	s = switch
+	sw = switch
 	sc = switch -c
 	sm = !git switch $(git main)
 
@@ -119,10 +121,10 @@
 	rbm = !git rb $(git main)
 
 	sta = stash
-	stl = !git --no-pager stash list
+	stl = !git --no-pager stash list --pretty=tformat:'%gd%h - %s (%cr)'
 	sts = stash show -v
 	stp = stash pop
-	std = stash drop
+	std = !git stash drop && git stl
 
 	rh = reset HEAD~
 	rs = reset --keep
diff --git a/.config/git/git-bugreport-2021-02-13-2112.txt b/.config/git/git-bugreport-2021-02-13-2112.txt
new file mode 100644
index 0000000..9574cbf
--- /dev/null
+++ b/.config/git/git-bugreport-2021-02-13-2112.txt
@@ -0,0 +1,32 @@
+Thank you for filling out a Git bug report!
+Please answer the following questions to help us understand your issue.
+
+What did you do before the bug happened? (Steps to reproduce your issue)
+git status --short --show-stash --branch
+
+What did you expect to happen? (Expected behavior)
+The status shows info about the stash, e.g. next to the branch infos
+
+What happened instead? (Actual behavior)
+--show-stash is ignored in short mode
+
+
+[System Info]
+git version:
+git version 2.30.1
+cpu: x86_64
+no commit associated with this build
+sizeof-long: 8
+sizeof-size_t: 8
+shell-path: /bin/sh
+uname: Linux 5.10.15-arch1-1 #1 SMP PREEMPT Wed, 10 Feb 2021 18:32:40 +0000 x86_64
+compiler info: gnuc: 10.2
+libc info: glibc: 2.33
+$SHELL (typically, interactive shell): /bin/zsh
+
+
+[Enabled Hooks]
+post-commit
+post-checkout
+post-merge
+pre-push
diff --git a/.local/bin/scripts/git-st b/.local/bin/scripts/git-st
deleted file mode 100755
index 31792e9..0000000
--- a/.local/bin/scripts/git-st
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-git stl && git stb "$@"