Camwyn · September 10, 2024 18:24 · Camwyn · May 28, 2015 · Camwyn · May 19, 2016
diff --git a/.gitconfig b/.gitconfig
 [alias]
 	# list aliases
 	aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'

 	# list branches
 	br = branch

 	# show current branch - tried to use to get branch name for other aliases
 	bn = !git rev-parse --abbrev-ref HEAD

 	# git commit
 	cm = commit

 	# git add --all && git commit
 	cma = !sh -c 'git add --all && git commit -a' -

 	# git checkout
 	co = checkout

 	# create/checkout new branch
 	cob = checkout -b

 	# delete branch
 	del = !sh -c 'git branch -D $1' -

 	# git diff
 	df = diff

 	# show last commit details
 	last = cat-file commit HEAD

 	# colorful git log - should delete this, I don't really use it much
 	lg = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
 	mg = merge

 	# short log
 	slog = log --graph --all --topo-order --pretty='format:%h %ai %s%d (%an)'

 	# merge no fast-forward
 	mn = merge --no-ff

 	# pull and merge no fast-forward
 	mp = !sh -c 'git pull && git merge --no-ff $1' -

 	# add files to last commit - no message change
 	moar =  !sh -c 'git add --all && git commit --amend --no-edit' -

 	# merge (no fast-forward) and then show status
 	ms = !sh -c 'git merge --no-ff && git st'

 	# show new commits
 	new = !sh -c 'git log $1@{1}..$1@{0} "$@"'

 	# set origin no push - for when working with a fork and you don't want to accidentally push to origin
 	nopush = git remote set-url --push origin no_push

 	# push a new branch
 	pub = !sh -c 'git push -u origin $( git rev-parse --abbrev-ref HEAD )'

 	# Pull and submodule update
 	ps = !sh -c 'git pull && git submodule update --init --recursive'

 	# git status
 	st = status

 	# update submodules recursively
 	sub = submodule update --init --recursive

 	# unstage all added files
 	unstage = reset HEAD

 	# remove file from git tracking
 	untrack = !sh -c 'git rm --cache $1' -

 	# show cached diff
 	dc = diff --cached
 	
 [core]
 	editor = code --wait
 	hooksPath = /Users/stephenpage/.git/hooks
 	
 [diff]
    tool = default-difftool

 [difftool "default-difftool"]
    cmd = code --wait --diff $LOCAL $REMOTE

 [pull]
 	rebase = false
	[alias]
	# list aliases
	aliases = !git config --get-regexp 'alias.*' \| colrm 1 6 \| sed 's/[ ]/ = /'

	# list branches
	br = branch

	# show current branch - tried to use to get branch name for other aliases
	bn = !git rev-parse --abbrev-ref HEAD

	# git commit
	cm = commit

	# git add --all && git commit
	cma = !sh -c 'git add --all && git commit -a' -

	# git checkout
	co = checkout

	# create/checkout new branch
	cob = checkout -b

	# delete branch
	del = !sh -c 'git branch -D $1' -

	# git diff
	df = diff

	# show last commit details
	last = cat-file commit HEAD

	# colorful git log - should delete this, I don't really use it much
	lg = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
	mg = merge

	# short log
	slog = log --graph --all --topo-order --pretty='format:%h %ai %s%d (%an)'

	# merge no fast-forward
	mn = merge --no-ff

	# pull and merge no fast-forward
	mp = !sh -c 'git pull && git merge --no-ff $1' -

	# add files to last commit - no message change
	moar = !sh -c 'git add --all && git commit --amend --no-edit' -

	# merge (no fast-forward) and then show status
	ms = !sh -c 'git merge --no-ff && git st'

	# show new commits
	new = !sh -c 'git log $1@{1}..$1@{0} "$@"'

	# set origin no push - for when working with a fork and you don't want to accidentally push to origin
	nopush = git remote set-url --push origin no_push

	# push a new branch
	pub = !sh -c 'git push -u origin $( git rev-parse --abbrev-ref HEAD )'

	# Pull and submodule update
	ps = !sh -c 'git pull && git submodule update --init --recursive'

	# git status
	st = status

	# update submodules recursively
	sub = submodule update --init --recursive

	# unstage all added files
	unstage = reset HEAD

	# remove file from git tracking
	untrack = !sh -c 'git rm --cache $1' -

	# show cached diff
	dc = diff --cached

	[core]
	editor = code --wait
	hooksPath = /Users/stephenpage/.git/hooks

	[diff]
	tool = default-difftool

	[difftool "default-difftool"]
	cmd = code --wait --diff $LOCAL $REMOTE

	[pull]
	rebase = false