From 610980dd231bb4ca0770c8013ec1a803ebdb8318 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Wed, 13 Jan 2021 21:19:55 +0200
Subject: [PATCH] git: aliases: Move glsu to glsum in ls-files and add glsut

---
 aliases/available/git.aliases.bash | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index e14f9dbb..39d10c67 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -55,7 +55,6 @@ alias gcpx='git cherry-pick -x'
 alias gd='git diff'
 alias gds='git diff --staged'
 alias gdt='git difftool'
-alias glsu='git diff --name-only --diff-filter=U' # lists only the names of conflicted files
 
 # archive
 alias gexport='git archive --format zip --output'
@@ -78,6 +77,8 @@ alias gwc='git whatchanged'
 
 # ls-files
 alias gu='git ls-files . --exclude-standard --others' # Show untracked files
+alias glsut='gu'
+alias glsum='git diff --name-only --diff-filter=U' # Show unmerged (conflicted) files
 
 # gui
 alias ggui='git gui'