-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathgitconfig
109 lines (107 loc) · 2.9 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
[core]
excludesfile = ~/.gitignore_global
pager = delta
diff = delta
log = delta
reflog = delta
show = delta
# pager = diff-so-fancy | less --tabs=4 -RFX
[user]
name = Alexander Steppke
email = [email protected]
signingkey = 18C740F63953F199A0085AFB2B591E707DDD9CE2
[push]
default = current
[alias]
llog = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
br = branch
bd = branch -d
bD = branch -D
co = checkout
cb = checkout -b
cm = commit -m
fmn = fetch origin main:main
fm = fetch origin master:master
rbi = rebase -i
up = pull --rebase --autostash
rbm = rebase master
rbmn = rebase main
rb = rebase
pr = pull-request
amend = commit --amend --no-edit
reword = commit --amend
pushf = push -f
pf = push --force-with-lease
pff = push --force
force = push -f
prune = fetch --prune
diffs = diff --staged
uncommit = reset --soft HEAD^
unstage = reset
staged = diff --cached
pick = cherry-pick
branches = for-each-ref --sort=-committerdate --format=\"%(color:blue)%(authordate:relative)\t%(color:red)%(authorname)\t%(color:white)%(color:bold)%(refname:short)\" refs/remotes
[color]
ui = true
[gitsh]
prompt = "%D %c%b%#%w"
[commit]
template = ~/.gitCommitMsg
gpgsign = true
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[color "diff"]
meta = 227
frag = magenta bold
commit = 227 bold
old = red bold
new = green bold
whitespace = red reverse
[interactive]
diffFilter = delta --color-only --features=interactive
[merge]
ff = only
conflictstyle = diff3
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[tag]
forceSignAnnotated = true
[gpg]
program = /usr/local/MacGPG2/bin/gpg
[pull]
rebase = true
[fetch]
prune = true
[branch]
autoSetupMerge = true
autoSetupRebase = always
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
[init]
defaultBranch = main
[delta]
[delta]
minus-style = syntax "#3a273a"
minus-non-emph-style = syntax "#3a273a"
minus-emph-style = syntax "#6b2e43"
minus-empty-line-marker-style = syntax "#3a273a"
line-numbers-minus-style = "#b55a67"
plus-style = syntax "#273849"
plus-non-emph-style = syntax "#273849"
plus-emph-style = syntax "#305f6f"
plus-empty-line-marker-style = syntax "#273849"
line-numbers-plus-style = "#627259"
line-numbers-zero-style = "#3b4261"
features = decorations
[delta "interactive"]
keep-plus-minus-markers = false