-
Notifications
You must be signed in to change notification settings - Fork 1
/
.gitconfig
104 lines (103 loc) · 2.72 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
[user]
name = Adrian Kumpf
email = [email protected]
signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPl+4tZygDqAIweVtCg1LO17A3O+Jc2+bIpheTK56VLg
[core]
excludesfile = ~/.gitignore
[push]
default = simple
followTags = true
autoSetupRemote = true
[fetch]
prune = true
[color]
status = always
ui = true
[core]
editor = nvim
pager = delta --features "${ITERM_PROFILE:-dark}"
[help]
autocorrect = 1
[alias]
aa = add --all
ap = add --patch
ci = commit --verbose
amend = commit --amend --verbose
co = checkout
pl = pull
ps = push
st = status -sb
lo = log --oneline -n 15
wc = whatchanged -p --abbrev-commit --pretty=medium -- :!*package-lock.json :!*(yarn|Cargo).lock
stash-all = stash save --include-untracked
unstage = reset HEAD --
# Show the branches, ordered by most recently updated closest to prompt.
# Also shows the last commit and committer for each branch listed.
recent = for-each-ref --sort=committerdate refs/heads/ --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(color:red)%(objectname:short)%(color:reset) - %(contents:subject) - %(authorname) (%(color:green)%(committerdate:relative)%(color:reset))'
remove-gone = !git branch -D `git branch -v | grep '\\[gone\\]' | awk '{print($1)}'`
[diff]
tool = difftastic
colorMoved = default
algorithm = histogram
[difftool]
prompt = false
[difftool "difftastic"]
cmd = difft "$LOCAL" "$REMOTE"
[pager]
difftool = true
diff = delta
show = delta
log = delta
blame = delta
grep = delta
reflog = delta
[interactive]
diffFilter = delta --color-only --features "${ITERM_PROFILE:-dark}"
[delta]
hyperlinks = true
line-numbers = true
max-line-length = 16384
[delta "dark"]
light = false
syntax-theme = gruvbox_dark_medium
[delta "light"]
light = true
syntax-theme = GitHub
[github]
user = adriankumpf
[branch]
autosetuprebase = always
sort = -committerdate
[merge]
conflictStyle = zdiff3
log = 1000
[pull]
rebase = true
[rebase]
autosquash = true
autoStash = true
updateRefs = true
[rerere]
enabled = true
[merge "npm-merge-driver"]
name = automatically merge npm lockfiles
driver = npx npm-merge-driver merge %A %O %B %P
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
[absorb]
maxStack=50
[commit]
gpgsign = true
[gpg]
format = ssh
[gpg "ssh"]
program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
[tag]
gpgsign = true
[init]
defaultBranch = main
[includeIf "gitdir:~/Developer/work/"]
path = ~/Developer/work/.gitconfig