gitconfig

[user]
	name = Rob Hilgefort
	email = rjhilgefort@gmail.com
	profile = personal
	
[init]
	defaultBranch = main

[http]
	sslVerify = false

[pull]
	rebase = false

# [diff]
# 	external = difft

[alias]
	# View abbreviated SHA, description, and history graph of the latest 20 commits
	l = log --pretty=oneline -n 20 --graph --abbrev-commit
	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
	lg = !"git lg1"

	# Add it all
	aa = add -A

	# View the current working tree status using the short format
	# s = status -s
	s = !"git pp"
	st = status -s

	# Show the diff between the latest commit and the current state
	d = !"git diff-index --quiet HEAD -- || clear; git --no-pager diff --patch-with-stat"

	# `git di $number` shows the diff between the state `$number` revisions ago and the current state
	di = !"d() { git diff --patch-with-stat HEAD~$1; }; git diff-index --quiet HEAD -- || clear; d"

	# Pull in remote changes for the current repository and all its submodules
	p = !"git pull; git submodule foreach git pull origin master"

	# Clone a repository including all submodules
	c = clone --recursive

	# Commit all changes
	ca = !git add -A && git commit -av

	# Switch to a branch, creating it if necessary
	co = checkout

	# go = checkout -B
	go = "!f() { git checkout -b \"$1\" 2> /dev/null && git push origin -u \"$1\" || git checkout \"$1\"; }; f"

	# Show verbose output about tags, branches or remotes
	tags = !git --no-pager tag -l --sort=v:refname
	remotes = remote -v
	branches = branch -a
	branches-merged = branch --merged
	branches-no-merged = branch --no-merged

	# Amend the currently staged files to the latest commit
	amend = commit --amend --reuse-message=HEAD

	# Credit an author on the latest commit
	credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f"

	# Interactive rebase with the given number of latest commits
	reb = "!r() { git rebase -i HEAD~$1; }; r"

	# Pull and Push
	pp = !"git pull; git push"

	# Stash helpers
	sl = stash list
	ss = !git add -A && git stash save
	sa = "!sh -c 'git stash apply stash@{$1}' -"
	sp = "!sh -c 'git stash pop stash@{$1}' -"
	sd = "!sh -c 'git stash drop stash@{$1}' -"

	# Find branches containing commit
	find-branches = "!f() { git branch -a --contains $1; }; f"
	fb = "!f() { git branch -a --contains $1; }; f"

	# Find tags containing commit
	find-tags = "!f() { git describe --always --contains $1; }; f"
	ft = "!f() { git describe --always --contains $1; }; f"

	# Find commits by source code
	find-code = "!f() { git log --pretty=format:'%C(yellow)%h  %Cblue%ad  %Creset%s%Cgreen  [%cn] %Cred%d' --decorate --date=short -S$1; }; f"
	fc = "!f() { git log --pretty=format:'%C(yellow)%h  %Cblue%ad  %Creset%s%Cgreen  [%cn] %Cred%d' --decorate --date=short -S$1; }; f"

	# Find commits by commit message
	find-messages = "!f() { git log --pretty=format:'%C(yellow)%h  %Cblue%ad  %Creset%s%Cgreen  [%cn] %Cred%d' --decorate --date=short --grep=$1; }; f"
	fm = "!f() { git log --pretty=format:'%C(yellow)%h  %Cblue%ad  %Creset%s%Cgreen  [%cn] %Cred%d' --decorate --date=short --grep=$1; }; f"

	# Remove branches that have already been merged with master
	# a.k.a. ‘delete merged’
	delete-merged = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
	dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"

	# List contributors with number of commits
	contributors = shortlog --summary --numbered

	# Merge trunks
	merge-develop = !git fetch -p && git merge origin/develop
	md = !git fetch -p && git merge origin/develop
	merge-development = !git fetch -p && git merge origin/development
	mdm = !git fetch -p && git merge origin/development
	merge-master = !git fetch -p && git merge origin/master
	mm = !git fetch -p && git merge origin/master

[apply]
	# Detect whitespace errors when applying a patch
	whitespace = fix

[core]
	# Treat spaces before tabs and all kinds of trailing whitespace as an error
	# [default] trailing-space: looks for spaces at the end of a line
	# [default] space-before-tab: looks for spaces before tabs at the beginning of a line
	whitespace = space-before-tab,-indent-with-non-tab,trailing-space

	# Make `git rebase` safer on OS X
	# More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
	trustctime = false

[color]
	# Use colors in Git commands that are capable of colored output when
	# outputting to the terminal. (This is the default setting in Git ≥ 1.8.4.)
	ui = auto

[color "branch"]
	current = yellow reverse
	local = yellow
	remote = green

[color "diff"]
	meta = yellow bold
	frag = magenta bold # line info
	old = red # deletions
	new = green # additions

[color "status"]
	added = yellow
	changed = green
	untracked = cyan

[help]
	# Automatically correct and execute mistyped commands
	autocorrect = 1

[push]
	default = simple

# github
[url "git@github.com:"]
	insteadOf = "gh:"
	pushInsteadOf = "github:"
	pushInsteadOf = "git://github.com/"
[url "git://github.com/"]
	insteadOf = "github:"

# github gist
[url "git@gist.github.com:"]
	insteadOf = "gst:"
	pushInsteadOf = "gist:"
	pushInsteadOf = "git://gist.github.com/"
[url "git://gist.github.com/"]
	insteadOf = "gist:"

# bitbucket
[url "git@bitbucket.org:"]
	insteadOf = "bb:"
	pushInsteadOf = "bitbucket:"
	pushInsteadOf = "git://bitbucket.org/"
[url "git://bitbucket.org/"]
	insteadOf = "bitbucket:"

[includeIf "gitdir:~/Code/splunk/"]
  path = ~/.gitconfig.splunk