diff --git a/links/gitattributes b/links/gitattributes index bbfd1d2..67d7a83 100644 --- a/links/gitattributes +++ b/links/gitattributes @@ -24,3 +24,4 @@ Pipfile.lock diff=json *.ins diff=tex *.yaml diff=yq *.yml diff=yq +*.csv diff=csv diff --git a/links/gitconfig b/links/gitconfig index fa7f5b2..0138938 100644 --- a/links/gitconfig +++ b/links/gitconfig @@ -100,6 +100,8 @@ textconv = "f(){ gron \"$1\" 2>/dev/null || cat \"$1\"; }; f" [diff "yq"] textconv = "f(){ yq -P eval 'sort_keys(..)' \"$1\" 2>/dev/null || cat \"$1\"; }; f" +[diff "csv"] + textconv = "f() { mlr --csv cat \"$1\" || true; }; f" [difftool] prompt = no [merge]