Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Minor updates

  • Loading branch information...
commit d9ea9cd76f9890a37aaef10d77614c75f9177801 1 parent 5feea8e
@darconeous authored
Showing with 5 additions and 5 deletions.
  1. +5 −5 bin/git-shattings-defaults
View
10 bin/git-shattings-defaults
@@ -3,16 +3,16 @@
set -x
[ `uname` = 'Darwin' ] && {
- git config --global diff.plist.textconv "plutil -convert xml1 -o - -"
+ git config --global diff.plist.textconv "plutil -convert xml1 -o -"
+ git config --global diff.plist.cachetextconv true
+
git config --global filter.plist.clean "plutil -convert xml1 -o - -"
git config --global filter.plist.smudge "plutil -convert binary1 -o - -"
git config --global filter.plist-xml.clean "plutil -convert xml1 -o - -"
- git config --global filter.plist-xml.smudge "plutil -convert xml1 -o - -"
-
- git config --global diff.plist-bin.textconv "plutil -convert xml1 -o - -"
git config --global filter.plist-bin.clean "plutil -convert binary1 -o - -"
- git config --global filter.plist-bin.smudge "plutil -convert binary1 -o - -"
+
+ git config --global diff.image.textconv "mdls"
}
git config --global diff.sqlite3.textconv "sqlite3 /dev/stdin .dump <"
Please sign in to comment.
Something went wrong with that request. Please try again.