We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 8fb2d41 commit 3537c25Copy full SHA for 3537c25
1 file changed
bin/git-resolve
@@ -9,7 +9,7 @@ git diff --name-only --diff-filter=U --relative -z |
9
# `--quiet` implies `--exit-code` which is incompatible with `--check`;
10
# however, it could be special-cased internally, so it could work
11
# (untested)
12
- if ! git diff --check -- "$f" &>/dev/null; then
+ if ! git -c core.whitespace='' diff --check -- "$f" &>/dev/null; then
13
printf '%s\0' "$f"
14
fi
15
done |
@@ -23,7 +23,7 @@ git diff --name-only --diff-filter=U -z |
23
while IFS= read -r -d '' f; do
24
# WARN: `f` is relative to repo root!
25
# this might be broken
26
- if git diff --check -- "$f"; then
+ if git -c core.whitespace='' diff --check -- "$f"; then
27
git add -- "$f"
28
29
done
0 commit comments