From 9625d91ef576d257e20cb120e8ca48e6353d2cfa Mon Sep 17 00:00:00 2001
From: JohnE <git@malloc.io>
Date: Thu, 29 Dec 2016 17:40:00 -0800
Subject: [PATCH] MOD: updated the gitconfig to add submodule, also cleaned up
 the file

---
 .gitconfig                          | 72 +++++++++++++++--------------
 settings/mac_bash.sublime-workspace |  8 ++--
 2 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index 16d4d9f..41ba642 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -10,31 +10,6 @@
 [web]
 	browser = google-chrome
 [alias]
-	s = status
-	sb = status -s -b
-	#############
-	sa = stash apply
-	sc = stash clear
-	sd = stash drop
-	sl = stash list
-	sp = stash pop
-	ss = stash save
-	sw = stash show
-	#############
-	d = diff
-	dc = diff --cached
-	dl = difftool
-	dlc = difftool --cached
-	dk = diff --check
-	dck = diff --cached --check
-	#############
-	c = commit
-	ca = commit -a
-	cm = commit . -m
-	cam = commit -am
-	cd = commit --amend
-	cad = commit -a --amend
-	#############
 	a = add .
 	ai = add -i
 	#############
@@ -46,16 +21,6 @@
 	amr = am --resolved
 	ams = am --skip
 	#############
-	l = log --oneline
-	lg = log --oneline --graph --decorate
-	ls = log --stat
-	ll = log --oneline --decorate
-	#############
-	ch  = checkout
-	co  = checkout
-	chb = checkout -b
-	cob = checkout -b
-	#############
 	b  = branch
 	ba = branch -a
 	bd = branch -d
@@ -70,6 +35,25 @@
 	buv = bundle verify
 	bul = bundle list-heads
 	#############
+	c = commit
+	ca = commit -a
+	cm = commit . -m
+	cam = commit -am
+	cd = commit --amend
+	cad = commit -a --amend
+	#############
+	ch  = checkout
+	co  = checkout
+	chb = checkout -b
+	cob = checkout -b
+	#############
+	d = diff
+	dc = diff --cached
+	dl = difftool
+	dlc = difftool --cached
+	dk = diff --check
+	dck = diff --cached --check
+	#############
 	f = fetch
 	fo = fetch origin
 	#############
@@ -77,6 +61,11 @@
 	#############
 	fk = fsck
 	#############
+	l = log --oneline
+	lg = log --oneline --graph --decorate
+	ls = log --stat
+	ll = log --oneline --decorate
+	#############
 	m = merge
 	ma = merge --abort
 	mc = merge --continue
@@ -130,6 +119,19 @@
 	rso = remote show origin
 	rpo = remote prune origin
 	#############
+	sub = submodule
+	#############
+	s = status
+	sb = status -s -b
+	#############
+	sa = stash apply
+	sc = stash clear
+	sd = stash drop
+	sl = stash list
+	sp = stash pop
+	ss = stash save
+	sw = stash show
+	#############
 	w = show
 	wp = show -p
 	wr = show -p --no-color
diff --git a/settings/mac_bash.sublime-workspace b/settings/mac_bash.sublime-workspace
index 5305d61..3f3bb05 100644
--- a/settings/mac_bash.sublime-workspace
+++ b/settings/mac_bash.sublime-workspace
@@ -55,7 +55,7 @@
 			"file": "/Users/j3g/.bash_android",
 			"settings":
 			{
-				"buffer_size": 1705,
+				"buffer_size": 1881,
 				"encoding": "UTF-8",
 				"line_ending": "Unix"
 			}
@@ -129,7 +129,7 @@
 			"file": "/Users/j3g/.bash_history",
 			"settings":
 			{
-				"buffer_size": 10223,
+				"buffer_size": 10212,
 				"line_ending": "Unix"
 			}
 		}
@@ -1215,7 +1215,7 @@
 					"semi_transient": false,
 					"settings":
 					{
-						"buffer_size": 1705,
+						"buffer_size": 1881,
 						"regions":
 						{
 						},
@@ -2473,7 +2473,7 @@
 					"semi_transient": false,
 					"settings":
 					{
-						"buffer_size": 10223,
+						"buffer_size": 10212,
 						"regions":
 						{
 						},