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

.gitconfig@29fce4f498e5 (annotated)

.gitconfig

Sun, 06 Sep 2015 15:47:43 -0400

author

Meredith Howard <mhoward@roomag.org>

date

Sun, 06 Sep 2015 15:47:43 -0400

changeset 196

29fce4f498e5

parent 190

38ea48f9eae9

child 197

85a414f67356

permissions

-rw-r--r--

Update gitconfig alases

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]
196 29fce4f498e5 Update gitconfig alases Meredith Howard <mhoward@roomag.org> parents: 190 diff changeset	12	ci = commit
29fce4f498e5 Update gitconfig alases Meredith Howard <mhoward@roomag.org> parents: 190 diff changeset	13	rec = !sh -c '(git add -p -- $@ && git commit -v ) || git reset' --
29fce4f498e5 Update gitconfig alases Meredith Howard <mhoward@roomag.org> parents: 190 diff changeset	14	unrec = checkout --patch
29fce4f498e5 Update gitconfig alases Meredith Howard <mhoward@roomag.org> parents: 190 diff changeset	15	update = "!git remote update -p && git merge --ff-only --stat @{u}"
29fce4f498e5 Update gitconfig alases Meredith Howard <mhoward@roomag.org> parents: 190 diff changeset	16	in = "!git remote update -p; git log ..@{u}"
29fce4f498e5 Update gitconfig alases Meredith Howard <mhoward@roomag.org> parents: 190 diff changeset	17	out = log @{u}..
29fce4f498e5 Update gitconfig alases Meredith Howard <mhoward@roomag.org> parents: 190 diff changeset	18	cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d"
29fce4f498e5 Update gitconfig alases Meredith Howard <mhoward@roomag.org> parents: 190 diff changeset	19	ctags = "!~/.git_helpers/ctags"
29fce4f498e5 Update gitconfig alases Meredith Howard <mhoward@roomag.org> parents: 190 diff changeset	20	glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
29fce4f498e5 Update gitconfig alases Meredith Howard <mhoward@roomag.org> parents: 190 diff changeset	21	recent = for-each-ref --count=20 --sort=-committerdate --format='%(committerdate:short) %(refname:short)'
93 f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2) Meredith Howard <mhoward@roomag.org> parents: diff changeset	22
166 7d0c758c7a4d default to rebase w/ pull Meredith Howard <mhoward@roomag.org> parents: 93 diff changeset	23	[branch]
7d0c758c7a4d default to rebase w/ pull Meredith Howard <mhoward@roomag.org> parents: 93 diff changeset	24	autosetuprebase = always
196 29fce4f498e5 Update gitconfig alases Meredith Howard <mhoward@roomag.org> parents: 190 diff changeset	25	autosetupmerge = always
177 6d15a355e17a .gitconfig additions Meredith Howard <mhoward@roomag.org> parents: 173 diff changeset	26
6d15a355e17a .gitconfig additions Meredith Howard <mhoward@roomag.org> parents: 173 diff changeset	27	[push]
196 29fce4f498e5 Update gitconfig alases Meredith Howard <mhoward@roomag.org> parents: 190 diff changeset	28	default = current
177 6d15a355e17a .gitconfig additions Meredith Howard <mhoward@roomag.org> parents: 173 diff changeset	29
6d15a355e17a .gitconfig additions Meredith Howard <mhoward@roomag.org> parents: 173 diff changeset	30	[rebase]
6d15a355e17a .gitconfig additions Meredith Howard <mhoward@roomag.org> parents: 173 diff changeset	31	stat = true
173 757eaebee0a2 add include .gitconfig.local Meredith Howard <mhoward@roomag.org> parents: 166 diff changeset	32
186 4d168818b573 verbose git-up Meredith Howard <mhoward@roomag.org> parents: 182 diff changeset	33	# 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	34	[include]
757eaebee0a2 add include .gitconfig.local Meredith Howard <mhoward@roomag.org> parents: 166 diff changeset	35	path = ~/.gitconfig.local
757eaebee0a2 add include .gitconfig.local Meredith Howard <mhoward@roomag.org> parents: 166 diff changeset	36
182 5a18e80bf2ea add git-up config Meredith Howard <mhoward@roomag.org> parents: 180 diff changeset	37	# https://github.com/aanand/git-up
5a18e80bf2ea add git-up config Meredith Howard <mhoward@roomag.org> parents: 180 diff changeset	38	# $ gem install git-up
5a18e80bf2ea add git-up config Meredith Howard <mhoward@roomag.org> parents: 180 diff changeset	39	[git-up "rebase"]
190 38ea48f9eae9 skip the pager in git-up Meredith Howard <mhoward@roomag.org> parents: 186 diff changeset	40	log-hook = "echo \"changes on $1 -> $2:\"; git --no-pager log --oneline --decorate $1..$2"
182 5a18e80bf2ea add git-up config Meredith Howard <mhoward@roomag.org> parents: 180 diff changeset	41