Updated scripts

This commit is contained in:
Christoffer Martinsson 2024-10-14 10:57:32 +02:00
parent 1977d2e3de
commit 30cf3a62fe
4 changed files with 14 additions and 17 deletions

View File

@ -1,17 +1,12 @@
# default to personal config
[include]
path = ~/.gitconfig.personal
# when working on work projects
[includeIf "gitdir:**/work/**/.git"]
path = ~/.gitconfig.work
[user]
name = Christoffer Martinsson
email = cm@cmtec.se
[credential]
helper = cache
helper = store --file ~/.my-credentials
[credential "https://dev.azure.com"]
useHttpPath = true
[credential "https://git.cmtec.se"]
helper = store
helper = store --file ~/.my-credentials
username = cm
[pull]
rebase = false
@ -19,3 +14,8 @@
tool = nvimdiff
[mergetool]
keepBackup = false
# when working on work projects
[includeIf "gitdir:**/work/**/.git"]
path = ~/code_server/gitconfig.work

View File

@ -1,3 +0,0 @@
[user]
name = Christoffer Martinsson
email = cm@cmtec.se

View File

@ -3,5 +3,5 @@
email = christoffer.martinsson@mildef.com
[credential "https://git.mildef.com"]
helper = store
helper = store --file ~/.my-credentials
username = christoffer

View File

@ -45,7 +45,7 @@ set-option -sg escape-time 1
set-option -g focus-events on
# set -g allow-passthrough on
set -g extended-keys on
# set -g extended-keys on
set -g status-interval 2
set -g status-bg "#0c0c0c"
set -g status-fg "#6c6c6c"