-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
72 lines (67 loc) · 1.93 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
[init]
defaultBranch = main
[user]
name = Liam Woodleigh-Hardinge
email = [email protected]
signingkey = BF36F6F4D88647AA
[push]
autoSetupRebase = always
autoSetupRemote = true
updateRefs = true
default = simple
useForceIfIncludes = true
[fetch]
prune = true
[pull]
rebase = true
[rebase]
autosquash = true
autostash = true
[branch]
autosetuprebase = always
[commit]
; gpgsign = true
verbose = true
[color]
ui = true
[rerere]
enabled = true
autoupdate = true
[help]
autocorrect = 1
[credential]
helper = /usr/local/share/gcm-core/git-credential-manager
helper = store
[core]
autocrlf = input
safecrlf = true
editor = nvim
pager = delta
[include]
path = ~/.gitconfig-work
[alias]
co = checkout
fomo = !git fetch origin main && git rebase origin/main --autostash
br = branch
ci = commit
st = status
last = log -1 HEAD
graph = log --all --decorate --oneline --graph
accept-ours = "!f() { git checkout --ours -- \"${@:-.}\"; git add -u \"${@:-.}\"; }; f"
accept-theirs = "!f() { git checkout --theirs -- \"${@:-.}\"; git add -u \"${@:-.}\"; }; f"
recent = !git fetch origin && git for-each-ref --sort=-committerdate 'refs/heads' 'refs/remotes/origin' --format='%(committerdate:short) %(refname:short) (%(authorname))' --count 10
recent-remote = !git fetch origin && git for-each-ref --sort=-committerdate refs/remotes/origin --format='%(committerdate:short) %(refname:short) (%(authorname))' --count 10
[format]
pretty = "%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset"
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true # use n and N to move between diff sections
side-by-side = false
line-numbers = false
# delta detects terminal colors automatically; set one of these to disable auto-detection
dark = true
[merge]
conflictstyle = diff3
[diff]
colorMoved = default