Added a lot of aliases to gitconfig

gitconfig

@@ -10,9 +10,23 @@
 # When more specific variables of color.* are set, they always take precedence over this setting.
 # Defaults to false.
 	ui = auto
-    # diff = auto
-    # status = auto
-    # branch = auto
+	# diff = auto
+	# status = auto
+	# branch = auto
+
+[color "branch"]
+	current = yellow reverse
+	local = yellow
+	remote = green
+[color "diff"]
+	meta = yellow bold
+	frag = magenta bold
+	old = red bold
+	new = green bold
+[color "status"]
+	added = yellow
+	changed = green
+	untracked = cyan
 
 [gui]
 	fontdiff = -family Monaco -size 10 -weight normal -slant roman -underline 0 -overstrike 0
@@ -54,7 +68,7 @@
 	lf = log --pretty=fuller
 	ignorechanges = update-index --assume-unchanged
 	noticechanges = update-index --no-assume-unchanged
-	gcap = gc --aggressive --prune
+	gc-ap = gc --aggressive --prune
 	listconf = config --global --list
 	cam = commit -a -m
 	lsm = log -M --stat
@@ -81,29 +95,45 @@
 	l = log --stat -C
 	ll = log --stat -C -3
 	servehere = daemon --verbose --informative-errors --reuseaddr --export-all --base-path=. --enable=receive-pack
-    purgeme = !git clean -fd && git reset --hard
-    prunenow = gc --prune=now
-    fixup = !sh -c 'git commit -m \"fixup! $(git log -1 --format='\\''%s'\\'' $@)\"' -
-    squash = !sh -c 'git commit -m \"squash! $(git log -1 --format='\\''%s'\\'' $@)\"' -
-    ri = rebase --interactive --autosquash
-    ccfq = !sh -c 'git add $1 && git commit -m\"Placeholder\"' -
+	purgeme = !git clean -fd && git reset --hard
+	prunenow = gc --prune=now
+	ri = rebase --interactive --autosquash
 	lol = log --pretty=oneline --abbrev-commit
-	sealog = log --graph --decorate --pretty=oneline --abbrev-commit --all
-	logmsp = log --graph --all --decorate --pretty=oneline --abbrev-commit
 	blg = log --graph --decorate --all --abbrev-commit --pretty=oneline
-    lgso = log --graph --date=short --pretty=format:'%C(yellow)%h%Creset %cn%x09%cd %s%C(green bold)%d'
-    ro = !git fetch origin && git reset --hard origin/master
-    shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
+	slog = log --graph --simplify-by-decoration --all --abbrev-commit --pretty=oneline
+	lgso = log --graph --date=short --pretty=format:'%C(yellow)%h%Creset %cn%x09%cd %s%C(green bold)%d'
+	ro = !git fetch origin && git reset --hard origin/master
+	shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
 	pushnotes = !sh -c 'git push $1 refs/notes/*' -
 	fetchnotes = !sh -c 'git fetch $1 refs/notes/*:refs/notes/*' -
+	showignored = clean -ndX
+	showignored2 = ls-files --others --ignored --exclude-standard
+	showuntracked = ls-files --others --exclude-standard
+	rmmissing = !git rm $(git ls-files --deleted)
+	mergekeepoursonly = merge -s ours
+	redocommit = reset --soft HEAD^
+	listunstaged = diff --name-status
+	liststaged = diff --name-status --staged
+	listhistory = log --name-status
+	logn = log --oneline --name-only
+	busypeople = shortlog -6
+	busythisweek = shortlog --since=one.week.ago
+	configpushtracking = config push.default tracking
+	configpushnothing = config push.default nothing
+	configpushtracking = config push.default matching
+	configpushcurrent = config push.default current
 
-    # Other alias ideas that don't quite work yet
-    #testnewrepodoesntwork1 = !echo git init $1 && echo cd $1
-    #testnewrepodoesntwork2 = !sh -c 'git init $1; echo hi' -
-    #testnewrepodoesntwork3 = "!f() { git init $1}; f"
-    #testbashgitinit = "!bash -c 'git init $0'"
-    #testecho = !echo cd $1
-    #testbashfunction = "!function gitme() { git init $1; echo now cd to $1; }; gitme"
+	# Other alias ideas that don't quite work yet
+	#testnewrepodoesntwork1 = !echo git init $1 && echo cd $1
+	#testnewrepodoesntwork2 = !sh -c 'git init $1; echo hi' -
+	#testnewrepodoesntwork3 = "!f() { git init $1}; f"
+	nr = "!sh -c 'git init $0'"
+	echoparam1 = "!sh -c 'echo $0'"
+	#testshfunction = "!function gitme() { git init $1; cd $1; }; gitme"
+
+	fixup = "!sh -c 'git commit -m \"fixup! $(git log -1 --format='\\''%s'\\'' $@)\"' -"
+	squash = "!sh -c 'git commit -m \"squash! $(git log -1 --format='\\''%s'\\'' $@)\"' -"
+	ccfq = "!sh -c 'git add $1 && git commit -m\"Placeholder\"' -"
 
 
 [apply]
@@ -116,7 +146,7 @@
 [difftool]
 	prompt = false
 #[difftool "myaraxis"]
-    # cmd = araxisgitdiff ONE $LOCAL THREE FOUR $REMOTE
+	# cmd = araxisgitdiff ONE $LOCAL THREE FOUR $REMOTE
 
 [merge]
 	tool = araxis
@@ -133,7 +163,7 @@
 [github]
     # https://github.com/blog/180-local-github-config
     user = matthewmccullough
-    token = d3cc4fffdontyouwishitwere719d66d8657
+    token = MOVEALONG
 
 [url "git://github.com/"]
 	insteadOf = "ghg://"