-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
78 lines (78 loc) · 1.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
[user]
name = kashewnuts
email = [email protected]
[core]
editor = vim -Nu ~/.vim/minimal.vim
excludesfile = ~/.gitignore
quotepath = false
preloadindex = true
fscache = true
[color]
ui = true
[push]
default = simple
[gui]
encoding = utf-8
[i18n]
logOutputEncoding = utf-8
[alias]
lg = log --graph --abbrev-commit --date=relative
lga = log --graph --abbrev-commit --date=relative --all
br = branch
ci = commit
co = checkout
cof = !git branch -a | fzf | xargs git checkout
df = diff
dfc = diff --cached
dft = difftool
dftc = difftool --cached
st = status
unstage = reset -q HEAD --
uncommit = reset --mixed HEAD~
vimdiff = difftool --tool=vimdiff --no-prompt
vimp = !git ls-files | fzf | xargs -o vim
delete-merged-branches = !git branch --merged | grep -vE '\\*|main$|master$|develop$' | xargs -I % git branch -d %
# [format]
# pretty = %C(red)%h %C(green)%ci %C(bold blue)%an %C(blue)%m %C(yellow)%d %Creset%s
[fetch]
prune = true
[pull]
ff = only
[diff]
# tool = vimdiff
tool = vscode
[difftool]
prompt = false
trustExitCode = true # Be able to abort all diffs with `:cq` or `:cquit`
cmd = code --wait --diff $LOCAL $REMOTE
[merge]
# tool = vimdiff
tool = vscode
conflictstyle = diff3
[mergetool]
prompt = false
# trustExitCode = true
keepBackup = false
[mergetool "vscode"]
cmd = code --wait --merge $REMOTE $LOCAL $BASE $MERGED
# trustExitCode = false
# [rerere]
# enabled = true
[rebase]
autoStash = true
rebaseMerges = true
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process
[include]
path = .gitconfig.os
path = .gitconfig.local
[github]
user = kashewnuts
[ghq]
root = ~/.cache/plugged
root = ~/projects # One written later has primary
[init]
defaultBranch = master