-
-
Save tanglebones/6343f7e5ac2878d6e15c to your computer and use it in GitHub Desktop.
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
# this can be put in [repo]/.git/config for local settings | |
# or ~/.gitconfig for global settings | |
# create a difftool "nodiff" that just returns true | |
# this path is for Mac. On linux it's /bin/true i guess | |
[diff "nodiff"] | |
command = /usr/bin/true | |
# make git ignore white space differences, many different possibilites here | |
# check http://www.kernel.org/pub/software/scm/git/docs/git-config.html#_variables | |
[core] | |
whitespace = -trailing-space,-indent-with-non-tab,-tab-in-indent |
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
# place this text in [repo]/.git/info/attributes | |
# image files | |
*.png diff=nodiff | |
*.jpg diff=nodiff | |
*.gif diff=nodiff | |
# webfonts | |
*.ttf diff=nodiff | |
*.woff diff=nodiff | |
*.eot diff=nodiff | |
*.svg diff=nodiff | |
#flash | |
*.swf diff=nodiff | |
*.fla diff=nodiff | |
# movie files | |
*.m4v diff=nodiff | |
*.flv diff=nodiff | |
*.ogv diff=nodiff | |
*.webm diff=nodiff | |
*.mp4 diff=nodiff |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment