-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path.gitconfig
More file actions
165 lines (163 loc) · 4.62 KB
/
Copy path.gitconfig
File metadata and controls
165 lines (163 loc) · 4.62 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
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
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
[add.interactive]
useBuiltin = false # required for git 2.37.0
[advice]
detachedHead = false
forceDeleteBranch = false
skippedCherryPicks = false
statusHints = false
[alias]
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
cat = cat-file -p
ind = ls-files -s
l = log --graph --pretty=\"%h %aN %cd %d %s\"
ll = !git --no-pager l
all = l --all
alll = !git --no-pager l --all
[branch]
autosetuprebase = always
sort = -committerdate
[color]
ui = true
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = 227
frag = magenta bold
old = red bold
new = green bold
commit = 227 bold
whitespace = red reverse
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[color "status"]
added = yellow
changed = green
untracked = cyan
[color "sh"]
branch = yellow reverse
workdir = blue bold
dirty = red
dirty-stash = red
[column]
ui = auto
[commit]
gpgsign = true
repo-state = red
template = ~/.gitmessage
[core]
# pager = diff-so-fancy | less --tabs=4 --RAW-CONTROL-CHARS --quit-if-one-screen --no-init
pager = delta
whitespace = trailing-space,space-before-tab,tab-in-indent
# Set the length object names are abbreviated to. If unspecified or set to
# "auto", an appropriate value is computed based on the approximate number
# of packed objects in your repository, which hopefully is enough for
# abbreviated object names to stay unique for some time. If set to "no", no
# abbreviation is made and the object names are shown in their full length.
# The minimum length is 4.
abbrev = 4
autocrlf = input
[credential]
guiPrompt = false
helper = 1password
helper =
helper = /usr/local/share/gcm-core/git-credential-manager
[delta]
navigate = true # use n and N to move between diff sections
light = false # set to true if you're in a terminal w/ a light background color
[diff]
algorithm = patience
tool = Kaleidoscope
colorMoved = default
[diff "l10n"]
textconv = iconv -f utf-16 -t utf-8
[diff "plistbuddy"]
textconv = plistbuddy -c Print
[difftool]
prompt = false
[difftool "FileMerge"]
cmd = /Applications/FileMerge.app -left \"$LOCAL\" -right \"$REMOTE\"
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[diff-so-fancy]
markEmptyLines = false
changeHunkIndicators = true
stripLeadingSymbols = true
useUnicodeRuler = true
enabled = true
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
# FIXME: Is this still relevant? Maybe gem now: https://github.com/alebedev/git-media
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f
#[filter "xmlplist"]
# clean = git-plist-filter.sh
# smudge = git-plist-filter.sh
[gitbutler]
signCommits = true
gitbutlerCommitter = 1
[github]
user = phatblat
[gpg]
format = ssh
program = /usr/local/bin/gpg
[hub]
protocol = ssh
[init]
defaultBranch = main
[interactive]
diffFilter = delta --color-only
[log]
abbrevCommit = yes
date = format:%F %R
[merge]
tool = Kaleidoscope
conflictstyle = diff3
[mergetool]
keepBackup = false
prompt = false
[mergetool "FileMerge"]
cmd = /Applications/FileMerge.app -left \"$LOCAL\" -right \"$REMOTE\" -ancestor \"BASE\" -merge \"MERGED\"
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[push]
default = simple
autoSetupRemote = true
[pull]
rebase = true
[rerere]
enabled = true
[maintenance]
# Migrated out of ~/.config/git/config so this file is the only
# global Git config. See the [user] note below.
repo = /Users/phatblat/dev/ditto/ditto
[user]
# Identity is declared HERE deliberately. Git reads
# $XDG_CONFIG_HOME/git/config (~/.config/git/config) *before*
# ~/.gitconfig, and a single-valued key set here overrides the XDG
# copy. Declaring name/email here means a stray write to the XDG
# file can never silently reassign authorship again.
name = Ben Chatelain
email = ben@octop.ad
signingkey = ~/.ssh/id_ed25519.pub
[http]
postBuffer = 157286400
[gpg "ssh"]
allowedsignersfile = ~/.git-allowed-signers
[credential "https://dev.azure.com"]
useHttpPath = true
# Work identity by location. Repo-local `user.email` still wins over
# this, so existing per-repo overrides are unaffected. `gitdir:` matches
# the resolved git dir, so linked worktrees under ~/.worktrees/ inherit
# the identity of their main repo.
[includeIf "gitdir:~/dev/_GETDITTO/"]
path = ~/.gitconfig-ditto