-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
92 lines (92 loc) · 2.52 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
# vi: ft=gitconfig noexpandtab
[user]
name = jradtilbrook
email = [email protected]
signingkey = 43D5A065FC794FD1
[includeIf "gitdir:~/Developer/bk/"]
path = .gitconfig-bk
[includeIf "gitdir:~/developer/he/"]
path = .gitconfig-he
[commit]
gpgsign = true
[init]
defaultBranch = main
[branch]
autoSetupRebase = always
[branch "main"]
rebase = true
[branch "master"]
rebase = true
[core]
editor = nvim
pager = delta
whitespace = space-before-tab,-indent-with-non-tab,trailing-space
[color]
ui = true # show colour by default
[diff]
submodule = log
colorMoved = default
colorMovedWS = ignore-all-space
[interactive]
diffFilter = delta --color-only --features=interactive
[grep]
linenumber = true
[fetch]
prune = true
[alias]
dp = diff --cached @{push} # diff to what is currently pushed (without including pending)
orig = !find . -name '*.orig' -delete
ca = commit -v --amend
op = push -u origin HEAD
om = merge origin/main
reh = reset --hard @{push}
fetch-pr = "!f() { git fetch origin pull/$1/head:pr-$1; }; f"
l = log --graph --pretty=custom
rebm = rebase -i origin/main
uci = reset --soft HEAD^ # undo a commit to staging area
uns = reset HEAD -- # remove files from staging area
zap = fetch -p # prune remote tracked branches
wip = rebase -i @{push}
[pretty]
custom = format:%w(80,0,4)%C(auto)%d %h [%cn %cr]%Creset%n %s
[log]
date = local # default to local time in logs
decorate = true # show ref names by default
[status]
submoduleSummary = true
[push]
default = simple # only push to registered tracking branch
[credential]
#helper = cache --timeout=900 # remember credentials for 15mins
[merge]
conflictstyle = diff3 # also show original text in merge conflicts
tool = nvimdiff # use vim for conflict resolution in terminal
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[rerere]
enabled = true
[pull]
ff = only
; rebase = merges
# special config for custom diff program
[delta]
features = decorations navigate
line-numbers = true
file-style = omit
hunk-header-decoration-style = blue ul ol
hunk-header-line-number-style = red
hunk-header-style = file line-number syntax
syntax-theme = Catppuccin Macchiato
minus-style = "syntax #3B2C37"
minus-emph-style = "syntax #613038"
plus-style = "syntax #2A363B"
plus-emph-style = "syntax #2D4E45"
[credential "https://github.com"]
helper =
helper = !/usr/bin/gh auth git-credential
[credential "https://gist.github.com"]
helper =
helper = !/usr/bin/gh auth git-credential