Added git alias to list only conflicted files
parent
bc32b40088
commit
957cd578f7
|
|
@ -55,6 +55,7 @@ alias gcpx='git cherry-pick -x'
|
||||||
alias gd='git diff'
|
alias gd='git diff'
|
||||||
alias gds='git diff --staged'
|
alias gds='git diff --staged'
|
||||||
alias gdt='git difftool'
|
alias gdt='git difftool'
|
||||||
|
alias glsu='git diff --name-only --diff-filter=U' # lists only the names of conflicted files
|
||||||
|
|
||||||
# archive
|
# archive
|
||||||
alias gexport='git archive --format zip --output'
|
alias gexport='git archive --format zip --output'
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue