XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1733 from tbhaxor/patch-1 

Added git alias to list only conflicted files
pull/1783/head^2
Noah Gorny 2021-01-13 21:32:33 +02:00 committed by GitHub
parent a9b0ec7d1d 610980dd23
commit bb35450c17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aliases/available/git.aliases.bash
View File

@ -77,6 +77,8 @@ alias gwc='git whatchanged'
# ls-files # ls-files
alias gu='git ls-files . --exclude-standard --others' # Show untracked 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 # gui
alias ggui='git gui' alias ggui='git gui'