From 957cd578f76b482617891afd874bdc6388741beb Mon Sep 17 00:00:00 2001 From: Gurkirat Singh Date: Thu, 10 Dec 2020 09:27:42 +0530 Subject: [PATCH] Added git alias to list only conflicted files --- aliases/available/git.aliases.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash index 4f82ead0..e14f9dbb 100644 --- a/aliases/available/git.aliases.bash +++ b/aliases/available/git.aliases.bash @@ -55,6 +55,7 @@ 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'