-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Marcus Crane <[email protected]>
- Loading branch information
1 parent
c684337
commit 515b2dd
Showing
2 changed files
with
21 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,14 @@ | ||
[user] | ||
email = {{ .email }} | ||
name = {{ .name }} | ||
signingkey = 15DC6AC2068B5E35827845D20066202F5187A0C8 | ||
useConfigOnly = true | ||
email = {{ .email }} | ||
name = {{ .name }} | ||
signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBYJRc1rj7YqWxo3dDALqnjPwCY9askwTo1gq1xO/QhB | ||
useConfigOnly = true | ||
[push] | ||
default = current | ||
[pull] | ||
rebase = false | ||
rebase = false | ||
[commit] | ||
gpgSign = true | ||
gpgsign = true | ||
verbose = true | ||
[merge] | ||
conflictstyle = zdiff3 | ||
|
@@ -17,22 +17,27 @@ | |
[rebase] | ||
autostash = true | ||
[status] | ||
showStash = true | ||
showStash = true | ||
[checkout] | ||
workers = 0 | ||
workers = 0 | ||
[core] | ||
excludesFile = "~/.gitignore" | ||
hooksPath = "~/.githooks" | ||
excludesFile = "~/.gitignore" | ||
hooksPath = "~/.githooks" | ||
{{- if (eq .chezmoi.os "darwin") }} | ||
[gpg] | ||
program = /usr/local/MacGPG2/bin/gpg2 | ||
program = /usr/local/MacGPG2/bin/gpg2 | ||
{{ else }} | ||
[gpg] | ||
format = ssh | ||
[gpg "ssh"] | ||
program = "/opt/1Password/op-ssh-sign" | ||
{{- end }} | ||
[url "ssh://[email protected]/"] | ||
insteadOf = https://github.com/ | ||
insteadOf = https://github.com/ | ||
[init] | ||
defaultBranch = "main" | ||
defaultBranch = "main" | ||
{{ $workLite := (eq (env "WORK_MODE") "1") }} | ||
{{- if (or .workmode $workLite) }} | ||
[includeIf "gitdir:~/Code/work/"] | ||
path = ~/.work.gitconfig | ||
{{- end }} | ||
path = ~/.work.gitconfig | ||
{{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters