From 76181e3fe735b8a31c81911e00532b997878f25c Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 19 Sep 2024 11:20:19 +0200
Subject: [PATCH] git: new aliases; list options

---
 .config/git/config | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/.config/git/config b/.config/git/config
index 693b8b0..e004bc7 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -9,23 +9,43 @@
     path = ~/b1/customer/sap/.config/git/config
 
 [alias]
-    co = checkout
-    cn = checkout -b
-    cm = commit -m
-    l = log --pretty='format:%h %G? %s%d' -n10 --graph --color
-    fixup = "!git log -n50 --pretty='format:%h %s' --no-merges | fzf | cut -c -7 | xargs -o git commit --fixup"
-    tags = tag -l
+    # branches
     branches = branch -a
-    remotes = remote -v
+    sb = switch
+    sc = switch -c
+
+    # commits
+    cm = commit -m
+    fixup = "!git log -n50 --pretty='format:%h %s' --no-merges | fzf | cut -c -7 | xargs -o git commit --fixup"
+    ri = "rebase -i"
+
+    # push
+    pushf = "push --force-with-lease"
+
+    # log
+    l = log --pretty='format:%h %G? %s%d' -n20 --graph --color
+    fzs = "!git log -n50 --pretty='format:%h %s' --no-merges | fzf | cut -c -7 | xargs -o git show"
+
+    # status
     s = status -sb
     ss = s -uno
 
+    # other
+    tags = tag -l
+    remotes = remote -v
+
 [color]
     diff = auto
 
+[column]
+    ui = auto
+
 [init]
     defaultBranch = main
 
+[branch]
+    sort = -committerdate
+
 [rebase]
     autosquash = true