-
Notifications
You must be signed in to change notification settings - Fork 2
/
.gitconfig
100 lines (99 loc) · 2.76 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
[alias]
# Ammend
amend = commit --amend
# Branch
br = branch
brr = for-each-ref --sort="-committerdate" refs/heads --format='%(align:width=65)%(color:green)%(committerdate:short)%(color:reset) %(HEAD) %(color:bold yellow)%(refname:short)%(color:reset)%(end) %(contents:subject)' --color=always
# Commit
ci = commit
# Clone
cl = clone
# Checkout
co = checkout
# Diff
df = diff
# Commit graph
graph = log --graph --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset'
# List git aliases
la = "!git config -l | grep alias | cut -c 7-"
# List date, user
ld = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]%Creset" --decorate --date=short -n 20
# List message, user, files
ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]\\ %C(green)(%cr)%Creset" --decorate --numstat -n 5
# List message, user
ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]\\ %C(green)(%cr)%Creset" --decorate -n 20
st = status
g = grep --break --heading --line-number
# Preserve iws files when cleaning out a repo for build purposes
cleanrepo = clean -xdf -e .idea -e TEST_FLAVOR -e local_pg_env.properties
commend = commit --amend --no-edit
# Shows a git blame back to the origin it was added
shame = blame -w -C -C -C
# how stash probably should have worked
staash = stash --all
# find by regex in logs, good for finding old tokens that have been removed
find = log -p -S
# useful for better diff reading when subline matters
wdiff = diff --word-diff
[interactive]
diffFilter = delta --color-only
[diff]
colorMoved = default
[color]
branch = auto
diff = auto
interactive = auto
status = auto
[core]
editor = nvim
pager = delta
excludesfile = /Users/bmarcaurele/.gitignore_global
commitGraph = true
precomposeUnicode = true
untrackedcache = true
fsmonitor = true
[push]
default = current
[user]
name = Brandon Marc-Aurele
email = bmarcaurele@palantir.com
signingkey = 33CB92BE6581A2C2
[github]
user = bmarcaur
[rerere]
enabled = true
[merge]
conflictstyle = diff3
[grep]
extendRegexp = true
lineNumber = true
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process
[http]
cookiefile = /Users/bmarcaurele/.gitcookies
[pull]
ff = only
[hub]
host = github.palantir.build
[url "git@github.palantir.build:"]
insteadOf = https://github.palantir.build/
[commit]
gpgsign = true
[tag]
forceSignAnnotated = true
gpgsign = true
[delta]
blame-code-style = syntax
blame-palette = "#002b36" "#073642" "#004152" "#005266" "#00627A"
hyperlinks = true
light = false
navigate = true
syntax-theme = Solarized (dark)
theme = Solarized (dark)
[column]
ui = auto
[branch]
sort = -committerdate