Last active
December 7, 2021 21:11
-
-
Save cmbuckley/6999ea7228f0cb9e50c060cd64879fd2 to your computer and use it in GitHub Desktop.
Using gron as an external git diff driver
This file contains hidden or 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
| *.json diff=gron |
This file contains hidden or 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
| [diff "gron"] | |
| textconv=gron --no-sort | |
| [core] | |
| # or omit this and put the attributes file | |
| # in ~/.config/git/attributes instead | |
| attributesfile=~/.gitattributes |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
This allows you to use gron as an external diff tool for git.
You just need both of these files in your
$HOME, plus gron of course 😄Usage:
git show HEAD:test.json { "foo": "bar" } cat test.json { "foo": "bar", "baz": "quux" } git diff test.json diff --git test.json test.json index c8c4105..3fe4371 100644 --- test.json +++ test.json @@ -1,2 +1,3 @@ json = {}; json.foo = "bar"; +json.baz = "quux";