adam
/
laughing-hipster
mirror of https://github.com/adamveld12/laughing-hipster
1
0
Fork 0
Code Issues Releases Wiki Activity

line ending setup

pull/1/head
Adam Veldhousen 2014-07-15 10:55:23 -05:00
parent 89071d3826
commit 6e423fef28
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitconfig
View File

@ -39,6 +39,11 @@
# instead of a/b/c/d as prefixes for patches # instead of a/b/c/d as prefixes for patches
mnemonicprefix = true mnemonicprefix = true
[merge]
tool = extMerge
[merge "extMerge"]
cmd = 'vim -d "$BASE" "$LOCAL" "$REMOTE" "$MERGED"'
[advice] [advice]
statusHints = false statusHints = false
@ -62,6 +67,7 @@
# More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/> # More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
trustctime = false trustctime = false
editor = gvim editor = gvim
autocrlf = true
[color] [color]
# Use colors in Git commands that are capable of colored output when # Use colors in Git commands that are capable of colored output when
@ -72,15 +78,18 @@
current = yellow reverse current = yellow reverse
local = yellow local = yellow
remote = green remote = green
[color "diff"] [color "diff"]
meta = yellow bold meta = yellow bold
frag = magenta bold frag = magenta bold
old = red bold old = red bold
new = green bold new = green bold
[color "status"] [color "status"]
added = yellow added = yellow
changed = green changed = green
untracked = cyan untracked = cyan
[merge] [merge]
# Include summaries of merged commits in newly created merge commit messages # Include summaries of merged commits in newly created merge commit messages
log = true log = true