-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgitconfig
More file actions
68 lines (67 loc) · 1.7 KB
/
Copy pathgitconfig
File metadata and controls
68 lines (67 loc) · 1.7 KB
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
[color]
diff = auto
status = auto
branch = auto
ui = true
[user]
name = Jaymie Jones
email = jaymiejones86@gmail.com
signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBct8TQnO0FrBygKaVz45a4Ru0E6KtXALKejDsLef84v
[core]
excludesfile = /Users/jaymiejones/.gitignore_global
attributesfile = /Users/jaymiejones/.gitattributes
pager = delta
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true
side-by-side = true
line-numbers = true
[mergetool "sourcetree"]
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[github]
user = jaymiejones86
[alias]
lgg = log --graph --max-count=5
lg = log --stat --max-count=5
rh = reset HEAD
today = log --graph --oneline --decorate --color --all --since=\"24 hours ago\" --author="jaymiejones86@gmail.com"
oops = reset --hard 'HEAD@{1}'
uncommit = reset --soft HEAD^
unstage = reset
unchange = checkout --
dw = diff --word-diff
[push]
default = simple
[commit]
template = ~/.gitmessage
gpgsign = true
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process
[pull]
rebase = false
[gpg]
format = ssh
[diff]
colorMoved = default
[protocol]
version = 2
[include]
path = /Users/jaymiejones/.local/.gitconfig-local
[merge]
conflictstyle = diff3
[trace2]
eventTarget = af_unix:dgram:/tmp/olly-git-trace2.sock
configparams = remote.origin.url
[gpg "ssh"]
allowedSignersFile = /Users/jaymiejones/.ssh/allowed_signers
program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
[init]
defaultBranch = main