-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig##template
68 lines (54 loc) · 1.62 KB
/
.gitconfig##template
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
[user]
name = Ted Kulp
{% if yadm.hostname == "ALLOCATE-Y3HW9MWW2D" %}
email = [email protected]
signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFsv4Cz+g1q93ifvEhSyMgE6mWiKacoLRKyHgWC7Vey7
{% else %}
email = [email protected]
gmail = [email protected]
signingKey = AE6B007E2FAB1C94319C7C09FD56BE79CDAE7895
{% endif %}
{% if yadm.hostname == "ALLOCATE-Y3HW9MWW2D" %}
[core]
commentChar = @
pager = delta
[gpg]
format = ssh
[gpg "ssh"]
program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
allowedSignersFile = /Users/tedkulp/.ssh/allowed_signers
{% else %}
[core]
pager = delta
{% endif %}
[commit]
gpgsign = true
[credential]
helper = osxkeychain
[pull]
rebase = false
[tag]
forceSignAnnotated = true
[alias]
mdr = merge --no-commit --no-ff
mom = merge --no-edit origin/main
moma = merge --no-edit origin/master
dlb = "dead-local-branches"
ddlb = "delete-dead-local-branches"
fdlb = "force-delete-dead-local-branches"
dead-local-branches = "!git branch -vv | grep ': gone]'| grep -v '\\*' | awk '{ if ($1 == \"+\") print $2; else print $1; }'"
delete-dead-local-branches = "!git branch -vv | grep ': gone]'| grep -v '\\*' | awk '{ if ($1 == \"+\") print $2; else print $1; }' | xargs -r git branch -d"
force-delete-dead-local-branches = "!git branch -vv | grep ': gone]'| grep -v '\\*' | awk '{ if ($1 == \"+\") print $2; else print $1; }' | xargs -r git branch -D"
[init]
defaultBranch = main
[push]
autoSetupRemote = true
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true
dark = true
[merge]
conflictstyle = diff3
[diff]
colorMoved = default