• file
• latest
• revisions
• annotate
• diff
• comparison
• raw

.gitconfig@84c6fa7ebc05 (annotated)

.gitconfig

Mon, 01 Jun 2015 17:13:43 -0700

author

Meredith Howard <mhoward@roomag.org>

date

Mon, 01 Jun 2015 17:13:43 -0700

changeset 187

84c6fa7ebc05

parent 186

4d168818b573

child 190

38ea48f9eae9

permissions

-rw-r--r--

only wait 5 sec to try updating tags

93 f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2) Meredith Howard <mhoward@roomag.org> parents: diff changeset	1	[user]
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2) Meredith Howard <mhoward@roomag.org> parents: diff changeset	2	email = mhoward@roomag.org
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2) Meredith Howard <mhoward@roomag.org> parents: diff changeset	3	name = Meredith Howard
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2) Meredith Howard <mhoward@roomag.org> parents: diff changeset	4
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2) Meredith Howard <mhoward@roomag.org> parents: diff changeset	5	[ui]
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2) Meredith Howard <mhoward@roomag.org> parents: diff changeset	6	color = true
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2) Meredith Howard <mhoward@roomag.org> parents: diff changeset	7
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2) Meredith Howard <mhoward@roomag.org> parents: diff changeset	8	[core]
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2) Meredith Howard <mhoward@roomag.org> parents: diff changeset	9	pager = LESS='FSRX' less
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2) Meredith Howard <mhoward@roomag.org> parents: diff changeset	10
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2) Meredith Howard <mhoward@roomag.org> parents: diff changeset	11	[alias]
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2) Meredith Howard <mhoward@roomag.org> parents: diff changeset	12	ci = commit
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2) Meredith Howard <mhoward@roomag.org> parents: diff changeset	13	record = !sh -c '(git add -p -- $@ && git commit -v ) || git reset' --
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2) Meredith Howard <mhoward@roomag.org> parents: diff changeset	14	update = !git fetch --all --tags --prune && git pull --rebase
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2) Meredith Howard <mhoward@roomag.org> parents: diff changeset	15	incoming = "!git remote update -p; git log ..@{u}"
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2) Meredith Howard <mhoward@roomag.org> parents: diff changeset	16	outgoing = log @{u}..
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2) Meredith Howard <mhoward@roomag.org> parents: diff changeset	17	glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
177 6d15a355e17a .gitconfig additions Meredith Howard <mhoward@roomag.org> parents: 173 diff changeset	18	cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d"
180 96dbe6a6008d ctags tweaking Meredith Howard <mhoward@roomag.org> parents: 177 diff changeset	19	ctags = !~/.git_helpers/ctags
93 f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2) Meredith Howard <mhoward@roomag.org> parents: diff changeset	20
166 7d0c758c7a4d default to rebase w/ pull Meredith Howard <mhoward@roomag.org> parents: 93 diff changeset	21	[branch]
7d0c758c7a4d default to rebase w/ pull Meredith Howard <mhoward@roomag.org> parents: 93 diff changeset	22	autosetuprebase = always
177 6d15a355e17a .gitconfig additions Meredith Howard <mhoward@roomag.org> parents: 173 diff changeset	23	autosetupmerge = always
6d15a355e17a .gitconfig additions Meredith Howard <mhoward@roomag.org> parents: 173 diff changeset	24
6d15a355e17a .gitconfig additions Meredith Howard <mhoward@roomag.org> parents: 173 diff changeset	25	[push]
6d15a355e17a .gitconfig additions Meredith Howard <mhoward@roomag.org> parents: 173 diff changeset	26	default = simple
6d15a355e17a .gitconfig additions Meredith Howard <mhoward@roomag.org> parents: 173 diff changeset	27
6d15a355e17a .gitconfig additions Meredith Howard <mhoward@roomag.org> parents: 173 diff changeset	28	[rebase]
6d15a355e17a .gitconfig additions Meredith Howard <mhoward@roomag.org> parents: 173 diff changeset	29	stat = true
173 757eaebee0a2 add include .gitconfig.local Meredith Howard <mhoward@roomag.org> parents: 166 diff changeset	30
186 4d168818b573 verbose git-up Meredith Howard <mhoward@roomag.org> parents: 182 diff changeset	31	# include.path is available in git 1.7.10 and later
173 757eaebee0a2 add include .gitconfig.local Meredith Howard <mhoward@roomag.org> parents: 166 diff changeset	32	[include]
757eaebee0a2 add include .gitconfig.local Meredith Howard <mhoward@roomag.org> parents: 166 diff changeset	33	path = ~/.gitconfig.local
757eaebee0a2 add include .gitconfig.local Meredith Howard <mhoward@roomag.org> parents: 166 diff changeset	34
182 5a18e80bf2ea add git-up config Meredith Howard <mhoward@roomag.org> parents: 180 diff changeset	35	# https://github.com/aanand/git-up
5a18e80bf2ea add git-up config Meredith Howard <mhoward@roomag.org> parents: 180 diff changeset	36	# $ gem install git-up
5a18e80bf2ea add git-up config Meredith Howard <mhoward@roomag.org> parents: 180 diff changeset	37	[git-up "rebase"]
186 4d168818b573 verbose git-up Meredith Howard <mhoward@roomag.org> parents: 182 diff changeset	38	log-hook = "echo \"changes on $1 -> $2:\"; git log --oneline --decorate $1..$2"
182 5a18e80bf2ea add git-up config Meredith Howard <mhoward@roomag.org> parents: 180 diff changeset	39