Wrapper script to use ktx compare for git diff. #919
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Those wishing to use this must run, or have run, install-gitconfig.{ps1,sh}
so that .gitconfig, which now includes a "ktx-compare" diff command will
be included by your repo clone's `.git/config`.
They need to have the `ktx` command installed and in the $PATH.
They need to add the line
*.ktx2 binary diff=ktx-compare
to their clone's .git/info/attributes or to a global Git attributes file.
This is not included in the repo's .gitattributes because not everyone
will have the ktx command installed.
Explicity call bash in "ktx-compare" so it will work on Windows, provided bash is installed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
ktxcommand 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
.gitattributesso are read first and.gitattributesalready has an entry for*.ktx2, indicatingbinary, which overrides anything from the global files.Will be happy to accept a PR to add a .ps1 equivalent script.