From 8cb956be45db63735c862aabd0df90619fb3fa8f Mon Sep 17 00:00:00 2001
From: Anthony Cicchetti <acicchetti@constantcontact.com>
Date: Tue, 21 Apr 2020 10:18:51 -0400
Subject: [PATCH] Bunch of gitconfig changes

---
 git/ctct/gitconfig | 13 -------------
 git/gitconfig      | 30 ++++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 13 deletions(-)
 delete mode 100644 git/ctct/gitconfig
 create mode 100644 git/gitconfig

diff --git a/git/ctct/gitconfig b/git/ctct/gitconfig
deleted file mode 100644
index 898b771..0000000
--- a/git/ctct/gitconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-# This is Git's per-user configuration file.
-[user]
-	name = acicchetti
-	email = acicchetti@constantcontact.com
-[diff]
-	tool = vimdiff
-[merge]
-	tool = vimdiff
-	conflictstyle = diff3
-[mergetool "vimdiff"]
-	cmd = nvim -d $BASE $LOCAL $REMOTE
-[core]
-	autocrlf = input
diff --git a/git/gitconfig b/git/gitconfig
new file mode 100644
index 0000000..6310709
--- /dev/null
+++ b/git/gitconfig
@@ -0,0 +1,30 @@
+# This is Git's per-user configuration file.
+[user]
+	name = Anthony Cicchetti
+	email = anthony@anthonycicchetti.com
+[alias]
+	pushall = !git remote | xargs -L1 git push --all
+[core]
+	autocrlf = input
+[include]
+    path = ~/.gitconfig_local
+[credential]
+	helper = ""
+	helper = manager-core
+[credential "https://dev.azure.com"]
+	useHttpPath = true
+[fetch]
+    prune = true
+[format]
+    pretty = fuller
+[log]
+    follow = true
+[pull]
+	rebase = true
+[diff]
+	tool = vimdiff
+[merge]
+	tool = vimdiff
+	conflictstyle = diff3
+[mergetool "vimdiff"]
+	cmd = nvim -d $BASE $LOCAL $REMOTE