Merge branch 'master' into jenipapo

This commit is contained in:
Thomas Ruoff
2016-08-31 08:16:16 +02:00

View File

@@ -7,9 +7,9 @@
interactive = auto interactive = auto
status = auto status = auto
[core] [core]
autocrlf = input
editor=vim -f +1 -c start! editor=vim -f +1 -c start!
autocrlf=input autocrlf=input
eol=lf
[alias] [alias]
st = status st = status
co = checkout co = checkout