Mercurial > hg > mhoward > dotfiles / file revision

[user]
	email = mhoward@roomag.org
	name  = Meredith Howard

[ui]
	color = true

[core]
	pager = LESS='FSRX' less

[alias]
	ci      = commit
	rec     = !sh -c '(git add -p -- $@ && git commit -v ) || git reset' --
	unrec   = checkout --patch
	update  = "!git remote update -p && git merge --ff-only --stat @{u}"
	in      = "!git remote update -p; git log ..@{u}"
	out     = log @{u}..
	cleanup = "!git branch --merged | grep  -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d"
	ctags   = "!~/.git_helpers/ctags"
	glog    = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
	recent  = for-each-ref --count=20 --sort=-committerdate --format='%(committerdate:short) %(refname:short)'

[branch]
	autosetuprebase = always
	autosetupmerge  = always

[push]
	default = current

[rebase]
	stat = true

# include.path is available in git 1.7.10 and later
[include]
	path = ~/.gitconfig.local

# https://github.com/aanand/git-up
# $ gem install git-up
[git-up "rebase"]
	log-hook = "echo \"changes on $1 -> $2:\"; git --no-pager log --oneline --decorate $1..$2"