-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
105 lines (96 loc) · 2.49 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
[user]
name = Carl Jackson
email = carl@avtok.com
[alias]
ama = commit --amend -CHEAD
amend = commit --amend
au = add -u
br = branch
co = checkout
cp = cherry-pick
cpx = cherry-pick -x
d = diff
dc = diff --cached
ff = merge --ff-only
files = show --pretty="" --name-only
l = log
pop = stash pop
pp = log --graph --pretty=format:'%C(yellow)%h%Creset %Cgreen%s%Creset - %aN, %ar%Cblue%d%Creset'
pr = !"bash -c \"comm -12 <(git for-each-ref --format='%(upstream:trackshort)%09%(refname:strip=2)' refs/heads/ | grep '^=' | cut -f2-) <(git remote prune origin 2>&1 | grep '^ \\\\*'| cut -d/ -f2-) | xargs -I{} git branch -D {}\""
rb = "!f() { if [ -z \"$1\" ]; then echo You must provide a branch name; exit 1; fi; git checkout -b \"$1\" $(git config rb.branch); git config \"branch.$1.merge\" \"refs/heads/$1\"; }; f"
re = "!git rebase $(git config rb.branch)"
s = status
showsig = show --show-signature
sign = commit --amend -CHEAD --gpg-sign
st = -c commit.gpgsign=false stash --keep-index --include-untracked
sup = "!git stash && git pull --rebase && git stash pop"
up = pull --rebase
wip = !git add -A && git commit -m "wip"
[color]
diff = auto
status = auto
branch = auto
interactive = auto
ui = auto
pager = true
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = 11
frag = magenta bold
func = 146 bold
commit = yellow bold
old = red bold
new = green bold
whitespace = red reverse
[color "status"]
added = yellow
changed = green
untracked = cyan
[core]
pager = "if command -v diff-so-fancy &>/dev/null; then diff-so-fancy | less --tabs=4 -RFX; else less --tabs=4 -RFX; fi"
whitespace = fix,trailing-space,space-before-tab,cr-at-eol
excludesfile = ~/.gitignore
[apply]
whitespace = fix
[advice]
pushNonFastForward = false
statusHints = false
[diff]
renames = copies
mnemonicprefix = true
[branch]
autosetupmerge = true
[push]
default = upstream
autoSetupRemote = true
[rerere]
enabled = true
[merge]
stat = true
conflictstyle = diff3
[include]
path = ~/.gitoverride
[http]
cookiefile = /Users/carl/.gitcookies
[alias]
change = codereview change
gofmt = codereview gofmt
mail = codereview mail
pending = codereview pending
submit = codereview submit
sync = codereview sync
[pull]
rebase = true
[rebase]
autosquash = true
[rb]
branch = origin/main
[init]
defaultBranch = main
[interactive]
diffFilter = diff-so-fancy --patch
[grep]
patternType = perl