We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 85b03f7 commit 16ebba4Copy full SHA for 16ebba4
functions/geometry_git.zsh
@@ -82,11 +82,9 @@ geometry_git_conflicts() {
82
83
pushd -q $(git rev-parse --show-toplevel)
84
85
- _grep="grep"
86
- (($+commands[ag])) && _grep="ag"
87
- (($+commands[rg])) && _grep="rg"
+ _grep=${GEOMETRY_GIT_GREP:=${commands[rg]:=${commands[ag]:=${commands[grep]}}}}
88
89
- conflict_list=$(${GEOMETRY_GIT_GREP:-$_grep} -cH '^=======$' $conflicts)
+ conflict_list=$($_grep -cH '^=======$' $conflicts)
90
popd -q
91
92
raw_file_count="${#${(@f)conflict_list}}"
0 commit comments