From 7158abd61153d90c8b02be00598a269a6056f531 Mon Sep 17 00:00:00 2001
From: Julian Prein <julian@druck.dev>
Date: Fri, 23 May 2025 13:19:25 +0200
Subject: [PATCH] git: Reorder aliases

Bring all blocks together and place shorter alias variants behind longer
ones - ignore the shorter ones in the sorting.

Remove the comment above `autosquash` because the command is fairly
descriptive and it is the only comment and I don't really know how to
format the block then (since the comment is at the very top it looks
like it is for the whole block and I don't want to put a newline behind
`autofixup`).
---
 .config/git/config | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/.config/git/config b/.config/git/config
index b51818e..4543e3e 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -4,42 +4,37 @@
 	addIgnoredFile = off
 	detachedHead = off
 [alias]
-	# Automatically fixup/squash marked commits without opening the
-	# git-rebase-todo
 	autosquash = -c sequence.editor=/bin/true rebase -i --autosquash
 	autofixup= autosquash
-
-	branches = track
 	c = commit
 	changes = flog HEAD...FETCH_HEAD
-	clm = commit-last-msg
-	co = checkout
+	checkout-worktree = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-checkout-worktree\""
 	cow = checkout-worktree
+	co = checkout
+	commit-last-msg = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-commit-last-msg\""
+	clm = commit-last-msg
+	last-msg = commit-last-msg
+	recommit = commit-last-msg --no-edit
 	f = fetch
 	fetch-tags-only = fetch origin "refs/tags/*:refs/tags/*"
-	fixes = log -1 --pretty=fixes
 	ft = fetch-tags-only
+	filter-repo = !git-filter-repo
+	fixes = log -1 --pretty=fixes
+	glog = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/glog\""
+	https-and-ssh  = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-https-and-ssh\""
+	ssh-and-https = https-and-ssh
 	l = log
-	last-msg = commit-last-msg
+	last-changed  = "!cd \"$GIT_PREFIX\"; \"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-last-changed\""
+	make-fork = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-make-fork\""
 	p = push
-	recommit = commit-last-msg --no-edit
+	perm-stash = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-perm-stash\""
 	root = rev-parse --show-toplevel
 	signoff = rebase --signoff
 	ss = stash
-	ssh-and-https = https-and-ssh
-
-	# Implemented as zsh functions or external programs
-	checkout-worktree = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-checkout-worktree\""
-	commit-last-msg = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-commit-last-msg\""
-	filter-repo = !git-filter-repo
-	glog = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/glog\""
-	https-and-ssh  = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-https-and-ssh\""
-	last-changed  = "!cd \"$GIT_PREFIX\"; \"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-last-changed\""
-	make-fork = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-make-fork\""
-	perm-stash = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-perm-stash\""
 	ssync = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-ssync\""
 	submodule-rm = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-submodule-rm\""
 	track = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-track\""
+	branches = track
 [blame]
 	date = short
 [branch]