From 813214f82f951c94723a877e8ec0f6019db8736e Mon Sep 17 00:00:00 2001
From: Colin Powell <colin@onec.me>
Date: Thu, 10 Jan 2019 10:40:01 -0500
Subject: [PATCH] Fix overwritte gitignore file #git

---
 git/.gitconfig        |  2 +-
 git/.gitignore        | 56 -------------------------------------------
 git/.gitignore_global | 30 +++++++++++++++++++++++
 3 files changed, 31 insertions(+), 57 deletions(-)
 delete mode 100644 git/.gitignore
 create mode 100644 git/.gitignore_global

diff --git a/git/.gitconfig b/git/.gitconfig
index b29ee84..c551f01 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -6,7 +6,7 @@
 [push]
 	default = current
 [core]
-	excludesfile = ~/.gitignore
+	excludesfile = ~/.gitignore_global
 [difftool "sourcetree"]
 	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
 	path = 
diff --git a/git/.gitignore b/git/.gitignore
deleted file mode 100644
index b29ee84..0000000
--- a/git/.gitignore
+++ /dev/null
@@ -1,56 +0,0 @@
-# This is Git's per-user configuration file.
-[user]
-	name = Colin Powell
-	email = colin@onec.me
-        signingkey = 7B405BE1
-[push]
-	default = current
-[core]
-	excludesfile = ~/.gitignore
-[difftool "sourcetree"]
-	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
-	path = 
-[mergetool "sourcetree"]
-	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
-	trustExitCode = true
-[alias]
-    undo = reset --soft HEAD^
-    stash-all = stash save --include-untracked
-    tree = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
-    oline = log --oneline --decorate --no-merges
-    st = status
-    ci = commit
-    br = branch
-    co = checkout
-    df = diff
-    l = log --date-order --date=iso --graph --full-history --all --pretty=format:'%x08%x09%C(red)%h %C(cyan)%ad%x08%x08%x08%x08%x08%x08%x08%x08%x08%x08%x08%x08%x08%x08%x08 %C(bold blue)%aN%C(reset)%C(bold yellow)%d %C(reset)%s'
-    lg = log -p
-    lg1 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
-    lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
-	hs  = for-each-ref --sort=-committerdate refs/heads/ --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(color:red)%(objectname:short)%(color:reset) - %(contents:subject) - %(authorname) (%(color:green)%(committerdate:relative)%(color:reset))'
-[merge]
-    conflictstyle = diff3
-[commit]
-	gpgsign = true
-[pager]
-  diff = diff-so-fancy | less --tabs=1,5 -RFX
-  show = diff-so-fancy | less --tabs=1,5 -RFX
-[gpg]
-	program = /usr/local/bin/gpg
-[status]
-    showUntrackedFiles = all
-[transfer]
-    fsckobjects = true
-[filter "lfs"]
-	clean = git-lfs clean -- %f
-	smudge = git-lfs smudge -- %f
-	process = git-lfs filter-process
-	required = true
-[branch]
-	autosetuprebase = always
-[magithub]
-	online = false
-[magithub "status"]
-	includeStatusHeader = false
-	includePullRequestsSection = false
-	includeIssuesSection = false
diff --git a/git/.gitignore_global b/git/.gitignore_global
new file mode 100644
index 0000000..d1b5798
--- /dev/null
+++ b/git/.gitignore_global
@@ -0,0 +1,30 @@
+# After symlinking this to your home dir, run:
+# > git config --global core.excludesfile ~/.gitignore
+.envrc
+.ropeproject
+flower
+group_vars_prod
+service-dtld
+dtld-test.ini
+pypicloud
+*.backup
+.dir-locals.el
+__pycache))
+*.pyc
+*.DS_Store
+GTAGS
+GRTAGS
+GPATH
+elation/test_lib
+.tern-port
+cscope.out
+test-reports/
+test_el8_dev.db
+package-lock.json
+.pyenv-version
+.mypy_cache
+.venv
+.rest
+._*
+.stignore
+local-config.diff