PageRenderTime 21ms CodeModel.GetById 16ms app.highlight 2ms RepoModel.GetById 1ms app.codeStats 0ms

/configuration/dot-gitconfig

http://github.com/matthewmccullough/git-workshop
#! | 200 lines | 186 code | 14 blank | 0 comment | 0 complexity | 205615e699f906d65131ffa961409e88 MD5 | raw file
  1[user]
  2	name = Your Name Goes Here
  3	email = yourname@yourcompany.com
  4
  5[color]
  6# ui = true is a superset of all the more specific color options
  7#  as documented at http://book.git-scm.com/5_customizing_git.html
  8# When set to always, always use colors in all git commands which are capable of colored output.
  9# When false, never. When set to true or auto, use colors only when the output is to the terminal.
 10# When more specific variables of color.* are set, they always take precedence over this setting.
 11# Defaults to false.
 12	ui = auto
 13	# diff = auto
 14	# status = auto
 15	# branch = auto
 16	
 17[color "branch"]
 18	current = yellow reverse
 19	local = yellow
 20	remote = green
 21[color "diff"]
 22	meta = yellow bold
 23	frag = magenta bold
 24	old = red bold
 25	new = green bold
 26[color "status"]
 27	added = yellow
 28	changed = green
 29	untracked = cyan
 30
 31[gui]
 32	fontdiff = -family Monaco -size 10 -weight normal -slant roman -underline 0 -overstrike 0
 33	recentrepo = /Users/mccm06/Documents/Temp/Scratch/hello/hgw1
 34
 35[core]
 36	excludesfile = ~/.gitignore
 37	quotepath = false
 38	autocrlf = input
 39	safecrlf = warn
 40	editor = mate -w
 41
 42[alias]
 43	br = branch -a
 44	s = status -s -u
 45	cl = log --stat -C -2
 46	c = commit
 47	co = checkout
 48	d = diff --color-words
 49	dh = diff HEAD
 50	dc = diff --staged
 51	dw = diff --word-diff
 52	dcw = diff --color-words
 53	dm = !git diff | mate
 54	dv = !git diff | vim
 55	who = shortlog -s --
 56	ph = push
 57	pl = pull
 58	lp = log -p
 59	lod = log --oneline --decorate
 60	lg = log --graph
 61	lpo = log --pretty=oneline --abbrev-commit --graph --decorate --all
 62	l1 = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
 63	l2 = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
 64	spull = !git-svn fetch && git-svn rebase
 65	spush = !git-svn dcommit
 66	sync = !git pull && git push
 67	es = !git pull --rebase && git push
 68	lf = log --pretty=fuller
 69	ignorechanges = update-index --assume-unchanged
 70	noticechanges = update-index --no-assume-unchanged
 71	gc-ap = gc --aggressive --prune
 72	listconf = config --global --list
 73	cam = commit -a -m
 74	lsm = log -M --stat
 75	hse = log --stat -5
 76	diffall = diff HEAD
 77	logr = log -M
 78	logr2 = log --stat -M -2
 79	logit = log --stat -M
 80	scrub = !git reset --hard && git clean -fd
 81	pub = !git pub checkout master && git pull && git checkout dev && git rebase master && git checkout master && git merge dev && git wtf
 82	cs = status
 83	rv = remote -v
 84	lwr = log --stat -C
 85	pur = pull --rebase
 86	whatis = show -s --pretty='tformat:%h (%s, %ad)' --date=short
 87	orphank = !gitk --all `git reflog | cut -c1-7`&
 88	orphanl = !git --pretty=oneline --abbrev-commit --graph --decorate `git reflog | cut -c1-7`
 89	k = !exec gitk --all&
 90	testecho1 = !sh -c 'echo with slash: zero=$0 one=$1 two=$2' -
 91	# te1 RESULT: with slash: zero=- one=A two=B
 92	testecho2 = !sh -c 'echo without slash: zero=$0 one=$1 two=$2'
 93	# te2 RESULT: without slash: zero=A one=B two=C
 94	st = status
 95	l = log --stat -C
 96	ll = log --stat -C -3
 97	servehere = daemon --verbose --informative-errors --reuseaddr --export-all --base-path=. --enable=receive-pack
 98	servedotgits = !git daemon --verbose --reuseaddr --base-path=. --export-all ./.git
 99	purgeme = !git clean -fd && git reset --hard
100	prunenow = gc --prune=now
101	ri = rebase --interactive --autosquash
102	lol = log --pretty=oneline --abbrev-commit
103	blg = log --graph --decorate --all --abbrev-commit --pretty=oneline
104	slog = log --graph --simplify-by-decoration --all --abbrev-commit --pretty=oneline
105	lgso = log --graph --date=short --pretty=format:'%C(yellow)%h%Creset %cn%x09%cd %s%C(green bold)%d'
106	ro = !git fetch origin && git reset --hard origin/master
107	shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
108	pushnotes = !sh -c 'git push $1 refs/notes/*' -
109	fetchnotes = !sh -c 'git fetch $1 refs/notes/*:refs/notes/*' -
110	showignored = clean -ndX
111	showignored2 = ls-files --others --ignored --exclude-standard
112	showuntracked = ls-files --others --exclude-standard
113	rmmissing = !git rm $(git ls-files --deleted)
114	mergekeepoursonly = merge -s ours
115	redocommit = reset --soft HEAD^
116	listunstaged = diff --name-status
117	liststaged = diff --name-status --staged
118	listhistory = log --name-status
119	logn = log --oneline --name-only
120	busypeople = shortlog -6
121	busythisweek = shortlog --since=one.week.ago
122	configpushtracking = config push.default tracking
123	configpushnothing = config push.default nothing
124	configpushtracking = config push.default matching
125	configpushcurrent = config push.default current
126	sizes = "!for eachthing in `git rev-list HEAD --all`; do echo `git cat-file -s $eachthing` $eachthing ; done"
127	emptytree = hash-object -t tree /dev/null
128	diffemptytreehash = diff -p 4b825dc642cb6eb9a060e54bf8d69288fbee4904
129	listfetchedcommits = log ORIG_HEAD.. --stat --no-merges
130	llog = log --date=local
131	diffnamestatus = diff --name-status
132	diffstat=diff --stat
133	whatsjusthappened = !sh -c 'git log $1@{1}..$1@{0} "$@"'
134	editconflicted = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; $EDITOR `f`"
135	addconflicted = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"
136
137	# Other alias ideas that don't quite work yet
138	#testnewrepodoesntwork1 = !echo git init $1 && echo cd $1
139	#testnewrepodoesntwork2 = !sh -c 'git init $1; echo hi' -
140	#testnewrepodoesntwork3 = "!f() { git init $1}; f"
141	nr = "!sh -c 'git init $0'"
142	echoparam1 = "!sh -c 'echo $0'"
143	#testshfunction = "!function gitme() { git init $1; cd $1; }; gitme"
144	
145	fixup = "!sh -c 'git commit -m \"fixup! $(git log -1 --format='\\''%s'\\'' $@)\"' -"
146	squash = "!sh -c 'git commit -m \"squash! $(git log -1 --format='\\''%s'\\'' $@)\"' -"
147	ccfq = "!sh -c 'git add $1 && git commit -m\"Placeholder\"' -"
148	bbnl = log --graph --abbrev-commit --decorate --all --pretty=oneline
149	bbnclean = clean -ndX
150
151
152[apply]
153	whitespace = nowarn
154[rerere]
155	enabled = 1
156
157[diff]
158	tool = araxis
159[difftool]
160	prompt = false
161#[difftool "myaraxis"]
162	# cmd = araxisgitdiff ONE $LOCAL THREE FOUR $REMOTE
163
164[merge]
165	tool = araxis
166[mergetool]
167	prompt = false
168	keepBackup = false
169#[mergetool "myaraxis"]
170    # cmd = araxisgitmerge $PWD/$REMOTE $PWD/$BASE $PWD/$LOCAL $PWD/$MERGED
171
172[branch]
173    # Automatically set up pull to be --rebase
174    # autosetuprebase = always
175
176[github]
177    # https://github.com/blog/180-local-github-config
178    user = yourgithubusername
179    token = yourgithubtoken
180
181[url "git://github.com/"]
182	insteadOf = "ghg://"
183	pushInsteadOf = "ghg://"
184	# Example: git clone ghg://ntschutta/emacs
185[url "git://github.com/matthewmccullough/"]
186    insteadOf = "ghgm://"
187    pushInsteadOf = "ghgm://"
188    # Example: git clone ghgm://hellogitworld
189[url "git@github.com:"]
190	insteadOf = "ghs://"
191	pushInsteadOf = "ghs://"
192[url "git@github.com:matthewmccullough/"]
193    insteadOf = "ghsm://"
194    pushInsteadOf = "ghsm://"
195[url "https://github.com/"]
196	insteadOf = "ghh://"
197	pushInsteadOf = "ghh://"
198[url "https://github.com/matthewmccullough/"]
199    insteadOf = "ghhm://"
200    pushInsteadOf = "ghhm://"