config/gitconfig at master · jbgutierrez/config · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
[user]
	name = Javier Blanco
	email = jbgutierrez@gmail.com
[alias]
	co = checkout
	ci = commit
	st = status -s
	br = branch
	type = cat-file -t
	dump = cat-file -p
	di = diff
	dc = diff --cached
	amend = commit --amend
	aa = add --all
	ff = merge --ff-only
	pullff = pull --ff-only
	noff = merge --no-ff
	fa = fetch --all
	pom = push origin master
	b = branch
	ds = diff --stat=160,120
	dh1 = diff HEAD~1
	edit-unmerged = "!f() { git diff --name-status --diff-filter=U | cut -f2 ; }; vim `f`"
	add-unmerged = "!f() { git diff --name-status --diff-filter=U | cut -f2 ; }; git add `f`"
	list-unmerged = "!git diff --name-status --diff-filter=U | cut -f2"
	l = log --oneline --decorate --graph
	head = !git l -1
	h = !git head
	r = !git l -30
	ra = !git r --all
	la = !git l --all
[apply]
	whitespace = strip
[core]
	editor = vim -f
	excludesfile = ~/.gitignore
	autocrlf = input # To configure line endings correctly on Linux/Mac
	safecrlf = true
	fileMode = false
[color]
	status = auto
	branch = auto
	interactive = auto
	diff = auto
	ui = true # To colorize git’s output for increased readability
[diff]
	tool = vimdiff
[push]
	default = simple # To limit pushes to your current branch
[http]
	sslVerify = false
[pull]
	rebase = true
[rerere]
	enabled = true # To record any merge conflict resolutions and reuse them automatically
[branch]
	autosetuprebase = always # To default all new branches to fetch and rebase - not merge
[credential]
	helper = osxkeychain
[github]
	user = jbgutierrez