-
Notifications
You must be signed in to change notification settings - Fork 2
/
gitconfig
114 lines (83 loc) · 2.12 KB
/
gitconfig
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
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
[user]
name = Alberto Vena
email = [email protected]
[github]
user = kennyadsl
[alias]
# Show all active aliases
alias = !git config --list | grep 'alias\\.' | sed 's/alias\\.\\([^=]*\\)=\\(.*\\)/\\1\\\t => \\2/' | sort
aa = add --all
ap = add --patch
br = branch
brr = branch --remote
# Fuzzy search branches
b = !git branch | fzf --ansi --reverse --no-sort | xargs git checkout
co = checkout
cob = co -b
cp = cherry-pick
ci = commit
cm = commit -m
call = commit -a
callm = commit -a -m
cane = commit --amend --no-edit
# Create a fixup commit with fuzzy search
cf = !git log -50 --color | fzf --ansi --reverse --no-sort | cut -d ' ' -f1 | xargs git commit --fixup
df = diff
dfc = diff --cached
f = fetch -a
fu = fetch -a upstream
l = log --pretty=colored
lg = log --graph --pretty=complete --abbrev-commit --date=relative
ll = log --stat --abbrev-commit
pr = pull --rebase
pu = pull upstream
pum = pull upstream master
pushf = push --force-with-lease
pf = pushf
rom = rebase origin/master
riom = rebase -i origin/master
rum = rebase upstream/master
rium = rebase -i upstream/master
st = status
s = st
skip = update-index --skip-worktree
unskip = update-index --no-skip-worktree
[core]
excludesfile = ~/.gitignore
autocrlf = input
editor = vim
attributesfile = ~/.gitattributes
[commit]
template = ~/.gitmessage
gpgsign = true
[fetch]
prune = true
[push]
default = current
[pull]
default = current
rebase = true
[rebase]
autosquash = true
[credential]
helper = osxkeychain
[hub]
protocol = https
[diff]
compactionHeuristic = true
[diff "rspec"]
xfuncname = "^[ \t]*((RSpec|describe|context|it|before|after|around|feature|scenario)[ \t].*)$"
[gpg]
program = gpg
[color]
ui = true
diff = true
status = true
branch = auto
[pretty]
colored = format:%Cred%h%Creset %s %Cgreen(%cr) %C(bold blue)%an%Creset
complete = format:%Cred%h%Creset -%C(yellow)%d%Creset %s (%C(green)%cr%Creset by %C(magenta)%an%Creset)
[format]
pretty = %Cblue%h%Creset %Cgreen[%ar]%Creset (%an) %s
[include]
path = .gitconfig-secrets