diff --git a/.config/git/config b/.config/git/config
index df4f8e3..474b0e0 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -16,7 +16,7 @@
 [alias]
 	root = rev-parse --show-toplevel
 	spull = "!__git_spull() { git pull \"$@\" && git submodule sync --recursive && git submodule update --init --recursive; }; __git_spull"
-	track = "!track() { git for-each-ref --format='%(upstream:short) <- %(refname:short)' refs/heads | sort | awk '{ print $3,$2,$1}' | column -t | sed 's/ *<- *$//'; }; track"
+	track = "!track() { git for-each-ref --format='%(upstream)%(if)%(upstream)%(then),%(end)%(refname)' refs/heads refs/remotes | sort -uk1,1 -t, | sed -E 's/(.*),(.*)/\\2,\\1/; s:(heads/[^,]*)$:\\1,:; s:^refs/remotes/:,:; s:refs/[^/]*/::g' | column -ts,; }; track"
 [status]
 	submodulesummary = true
 [diff]