.gitconfig

@@ -12,6 +12,7 @@
     editor = nano
     #editor = vim
     whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
+    safecrlf = false
 [web]
     browser = googlechrome
 [filter "lfs"]
@@ -26,9 +27,9 @@
     # Windows specific config - Uncomment to use.
     #program = C:\\Program Files (x86)\\GnuPG\\bin\\gpg.exe
     # Linux/BSD specific config - Uncomment to use.
-    #program = gpg
+    #program = /usr/bin/gpg
 [commit]
-    # Set to true if commits should be signed by default
+    # Set to true if commits should be gpg signed by default
     gpgsign = false
 [format]
     # Adds `Signed-off-by` to end of commit messages. If set to true
@@ -45,7 +46,9 @@
     #email = name@example.com
 [credential]
     # If using https: on linux. Enable credential.helper to store logins.
-    helper = store
+    #helper = store
+    # If using https: on Windows Enable credential.helper to store logins.
+    #helper = manager
 [push]
     default = matching
 [pull]
@@ -58,6 +61,9 @@
     renormalize = true
     verbosity = 4
     tool = winmerge
+[mergetool]
+    keepBackup = false
+    prompt = false
 [url "https://bitbucket.org/"]
     insteadOf = bb:
 [url "https://github.com/"]