-
Notifications
You must be signed in to change notification settings - Fork 3
/
Copy pathgitconfig
131 lines (109 loc) · 3.19 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
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
[user]
name = David Mohundro
email = [email protected]
[init]
defaultBranch = main
[core]
editor = nvim
autocrlf = input # set to true on Windows
pager = delta --side-by-side
[color "diff"]
meta = yellow bold
commit = green bold
frag = magenta bold
old = red bold
new = green bold
whitespace = red reverse
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "status"]
added = green
changed = yellow
untracked = cyan
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true
line-numbers = true
side-by-side = true
features = unobtrusive-line-numbers decorations
whitespace-error-style = 22 reverse
[delta "unobtrusive-line-numbers"]
line-numbers = true
line-numbers-minus-style = "#444444"
line-numbers-zero-style = "#444444"
line-numbers-plus-style = "#444444"
line-numbers-left-format = "{nm:>4}┊"
line-numbers-right-format = "{np:>4}│"
line-numbers-left-style = blue
line-numbers-right-style = blue
[delta "decorations"]
commit-decoration-style = bold yellow box ul
file-style = bold yellow ul
file-decoration-style = none
hunk-header-decoration-style = yellow box
[branch]
autosetuprebase = always
[pager]
difftool = true
[diff]
# tool = bc
tool = difftastic
guitool = bc
colorMoved = default
[difftool]
prompt = false
[difftool "difftastic"]
cmd = difft "$LOCAL" "$REMOTE"
[merge]
tool = bc
guitool = bc
conflictStyle = zdiff3
[mergetool]
prompt = false
[help]
autocorrect = 1
[alias]
st = status
ci = commit
co = checkout
recent = branch --sort=-committerdate
current = rev-parse --abbrev-ref HEAD
dc = difftool --cached
df = difftool
vdf = difftool --gui --dir-diff
vdfc = difftool --gui --dir-diff --cached
# Show files ignored by git:
ign = ls-files -o -i --exclude-standard
# Pretty logs
lg = log --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ad)%C(reset) %C(white)%s%C(reset) %C(cyan)- %an%C(reset)%C(bold yellow)%d%C(reset)' --graph --abbrev-commit --decorate --date=human --all
ll = log --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ad)%C(reset) %C(white)%s%C(reset) %C(cyan)- %an%C(reset)%C(bold yellow)%d%C(reset)' --decorate --numstat --date=human
fld = log --word-diff -u
# List aliases
la = "!git config -l | grep alias | cut -c 7-"
# improved grep display
g = grep --break --heading --line-number
# fzf aliases
cob = !BRANCH=`git recent --no-color | fzf` && git checkout ${BRANCH}
db = !BRANCH=`git branch --no-color | fzf` && git branch -d ${BRANCH}
dbf = !BRANCH=`git branch --no-color | fzf` && git branch -D ${BRANCH}
# stash, pull --rebase and stash pop
sps = "!git stash && git pull --rebase && git stash pop"
[grep]
extendRegexp = true
lineNumber = true
[credential]
helper = /usr/local/share/gcm-core/git-credential-manager
# helper should be manager-core on Windows
[includeif "hasconfig:remote.*.url:**/github.com/clearfunction/**"]
path = ~/dev/dotfiles/gitconfig-cf
# or [includeif "gitdir:~/dev/clearfunction/client/"]
[includeif "hasconfig:remote.*.url:**/github.com/client/**"]
path = ~/dev/clearfunction/client/.gitconfig