-
Notifications
You must be signed in to change notification settings - Fork 2
Expand file tree
/
Copy pathgitconfig
More file actions
83 lines (83 loc) · 2.08 KB
/
gitconfig
File metadata and controls
83 lines (83 loc) · 2.08 KB
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
[user]
email = edavis@insanum.com
name = Eric Davis
[git-p4]
user = edavis
port = pf-irva-ecs.broadcom.com:1666
[init]
defaultBranch = main
[core]
editor = nvim
pager = delta
[push]
autoSetupRemote = true
[rerere]
enabled = true
#[merge]
# conflictstyle = zdiff3
[delta]
features = side-by-side line-numbers decorations
whitespace-error-style = 22 reverse
tabs = 8
[delta "decorations"]
commit-decoration-style = bold yellow box ul
file-style = bold yellow ul
file-decoration-style = none
[tig "color"]
cursor = red color239
[color]
#diff = always
grep = always
ui = true
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold reverse
newNormal = green bold
newHighlight = green bold reverse
[color "diff"]
meta = yellow
frag = magenta bold
commit = yellow bold
old = red bold
new = green bold
whitespace = red reverse
[diff]
tool = p4merge
[difftool]
prompt = false
[grep]
extendRegexp = true
lineNumber = true
[alias]
####################
# GREP...
g = grep --break --heading --line-number
####################
# DIFF...
d = diff --patience
ds = diff --patience --staged
du = diff --patience --patch-with-stat -U10
dus = diff --patience --patch-with-stat -U10 --staged
dt = difftool
dts = difftool --staged
dft = -c diff.external=difft diff --patience
dfts = -c diff.external=difft diff --patience --staged
patch = !git -c pager.diff= diff --no-ext-diff --no-color
####################
# LOG...
t = log --graph --decorate --date=short --pretty=format:\"%Cgreen%h%Creset %Cblue%ad%Creset %s%d [%Cred%an%Creset]\"
####################
# STATUS...
s = status
si = status --ignored
####################
# BRANCH...
b = branch
bv = branch -vv
ba = branch -a
bav = branch -avv
####################
[include]
path = ~/.priv/gitconfig
[pull]
rebase = false