# apply crlf, or other cleanup filters (non-behavioural changes)
git reset --hard
find . -type f -exec touch {} \;
- git commit -a --amend -c HEAD
+ git commit -a --amend -C HEAD || true # don't fail if nothing to commit
echo "MERGING"
case ",`repoflags "$d"`," in
rmuntracked=true
elif [ x"$X" = x"-D" ]; then
killbranches=true
+ elif echo "$X" | grep '^-FFFF*UUUU*$' >/dev/null; then
+ msg ''
+ msg ' _____'
+ msg ' ,--'\''-\\P/`\\ FFFFFFF'
+ msg ' __/_ B/,-.\\ FFFFFFF'
+ msg ' / _\\ (// O\\\\ FFFFFF'
+ msg '| (O `) _\\._ _)\\ FFFUU'
+ msg '| |___/.^d0~~"\\ \\ UUUU'
+ msg '| |`~'\'' \\ | UUUU'
+ msg '| | __,C>|| UUUU'
+ msg '\\ /_ ,-/,-'\'' | UUUU'
+ msg ' \\\\_ \\_>~'\'' / UUUU-'
+ msg ''
else
- break
+ msg "Unknown arg: $X"
fi
found=true
shift
# texture: convert to jpeg and dds
verbose export do_jpeg=true
verbose export jpeg_qual_rgb=95
- verbose export jpeg_qual_a=99
+ verbose export jpeg_qual_a=100
verbose export do_dds=true
verbose export dds_flags=
verbose export do_ogg=false