chages

.gitconfig

@@ -1,21 +1,8 @@
-
-[alias]
- dry2 = "!f() { grep -q 'changed in both' < $(git merge-tree $(git merge-base FETCH_HEAD $1) $1 FETCH_HEAD) && echo 'Merge conflict detected' || echo 'Merged cleanly'; }; f"
-
- dry = "!f() { git merge-tree `git merge-base $2 $1` $2 $1; }; f"
- rshw = remote show
- rprn = remote prune
-
-[push]
- default = current
 [user]
- name = Charles Doutriaux
  email = [email protected]
-
-[color]
- ui = auto
-[url "git:https://uv-cdat.llnl.gov/windfield.git"]
- insteadof = http:https://uv-cdat.llnl.gov/git/windfield.git
+ name = Charles Doutriaux
 [http]
+ sslBackend = schannel
  sslVerify = false
-
+[core]
+ autocrlf = false