diff options
Diffstat (limited to '.gitconfig')
-rw-r--r-- | .gitconfig | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -39,7 +39,6 @@ lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' \ --abbrev-commit --date=relative - [core] editor = vim @@ -70,6 +69,9 @@ changed = green untracked = cyan +[http] + sslCAInfo = /home/jpokorny/.pki/tls/certs/ca-bundle.crt + # http://lukas.zapletalovi.com/2012/06/three-way-git-merging-and-meld.html # -> http://lukas.zapletalovi.com/2012/09/three-way-git-merging-with-meld.html [merge] |