diff --git a/bin/zzexe b/bin/zzexe deleted file mode 100755 index 57e226d..0000000 --- a/bin/zzexe +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -if [ "$1" = "-d" ]; then - shift - tail -n +11 "$1" | zstd -do "$1"~ && - mv "$1"~ "$1" - chmod +x "$1" - exit -else - if [ "$1" = "-p" ]; then - shift - prefix="$1 " - shift -fi - -{ echo '#!/bin/sh'; echo out=\`mktemp -t .zzXXXX."${1##*.}"\`; } >> "$1"~ -cat >> "$1"~ << 'EOF' -dir=`dirname "$0"` -tail -n +11 "$0" | zstd -cd > "$out" -chmod +x "$out" -ln -s "$out" "$dir" -trap "res=$?" 0 1 2 3 5 10 13 15 -EOF - echo "$prefix"'$dir/`basename $out` "$@"' >> "$1"~ -cat >> "$1"~ << 'EOF' -rm "$out" "$dir"/`basename $out` -exit $res -EOF - - zstdmt --ultra -22 "$1" && - cat "$1"~ "$1".zst > "$1" - rm "$1".zst "$1~" - chmod +x "$1" -fi diff --git a/bin/zzexe b/bin/zzexe new file mode 120000 index 0000000..f4ee8ab --- /dev/null +++ b/bin/zzexe @@ -0,0 +1 @@ +../../.appdwarf/zzexe \ No newline at end of file diff --git a/git/config b/git/config index aefb922..0ba45d9 100644 --- a/git/config +++ b/git/config @@ -47,6 +47,7 @@ caa = ca -a ch = checkout cl = gc --aggressive --prune=now + d = difftool g = clone gr = clone --recursive l = log @@ -62,3 +63,11 @@ rebase = false [init] defaultBranch = main +[diff] + tool = difftastic +[difftool] + prompt = false +[difftool "difftastic"] + cmd = difft "$LOCAL" "$REMOTE" +[pager] + difftool = true