davidbaiguini
7/15/2015 - 1:58 AM

Git

Git

# vi ~/.gitconfig
[user]
	name = Chuck Norris
	email = chuck.norris@image-centre.com
[core]
	excludesfile = /Users/davidbaiguini/.gitignore_global
	editor = vi
[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
[color]
	ui = auto
[color "status"]
	added = green
	changed = yellow
	untracked = cyan
[alias]
	aa = add --all
	amend = commit --amend
	ci = commit
	co = checkout
	di = diff
	dc = diff -- cached
	ds = diff --stat
	ff = merge --ff-only
	#lo = log --graph --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset'
	lo = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
	lop = log master..$1 --pretty=format:%s
	pom = push origin master
	pullff = pull --ff-only
	st = status -sb