mirror of
https://github.com/KhronosGroup/KTX-Software.git
synced 2026-01-18 17:41:19 +01:00
8cd4fea719
Those wishing to use this must run, or have run, install-gitconfig.sh so that .gitconfig, which now includes a "ktx-compare" diff command will be included by their repo clone's `.git/config`. They need to have the `ktx` command installed and in $PATH. They need to add the line *.ktx2 binary diff=ktx-compare to their clone's .git/info/attributes. This is not included in the repo's .gitattributes because not everyone will have the ktx command installed. This will not work in a user-global or system-global Git attributes file because those are lower priority than `.gitattributes` so are read first and `.gitattributes` already has an entry for `*.ktx2`, indicating `binary`, which overrides anything from the global files. Will be happy to accept a PR to add a .ps1 equivalent script.
17 lines
468 B
INI
17 lines
468 B
INI
# Copyright 2016-2024 The Khronos Group Inc.
|
|
# SPDX-License-Identifier: Apache-2.0
|
|
|
|
# Use ktx compare for diff'ing .ktx2 files.
|
|
# Note ktx-compare-git expects `ktx` to be in the user's path
|
|
[diff "ktx-compare"]
|
|
command = bash scripts/ktx-compare-git
|
|
|
|
# Filters used by KTX repo
|
|
[filter "keyworder"]
|
|
smudge = bash scripts/expand_kw %f
|
|
clean = bash -c \"sed -e 's/\\$Date.*\\$/\\$Date\\$/'\"
|
|
|
|
# Needed to avoid merge conflicts
|
|
[merge]
|
|
renormalize = true
|