Updated scripts
This commit is contained in:
parent
1977d2e3de
commit
30cf3a62fe
24
gitconfig
24
gitconfig
@ -1,21 +1,21 @@
|
|||||||
# default to personal config
|
[user]
|
||||||
[include]
|
name = Christoffer Martinsson
|
||||||
path = ~/.gitconfig.personal
|
email = cm@cmtec.se
|
||||||
|
|
||||||
# when working on work projects
|
|
||||||
[includeIf "gitdir:**/work/**/.git"]
|
|
||||||
path = ~/.gitconfig.work
|
|
||||||
|
|
||||||
[credential]
|
[credential]
|
||||||
helper = cache
|
helper = store --file ~/.my-credentials
|
||||||
[credential "https://dev.azure.com"]
|
[credential "https://dev.azure.com"]
|
||||||
useHttpPath = true
|
useHttpPath = true
|
||||||
[credential "https://git.cmtec.se"]
|
[credential "https://git.cmtec.se"]
|
||||||
helper = store
|
helper = store --file ~/.my-credentials
|
||||||
username = cm
|
username = cm
|
||||||
[pull]
|
[pull]
|
||||||
rebase = false
|
rebase = false
|
||||||
[merge]
|
[merge]
|
||||||
tool = nvimdiff
|
tool = nvimdiff
|
||||||
[mergetool]
|
[mergetool]
|
||||||
keepBackup = false
|
keepBackup = false
|
||||||
|
|
||||||
|
# when working on work projects
|
||||||
|
[includeIf "gitdir:**/work/**/.git"]
|
||||||
|
path = ~/code_server/gitconfig.work
|
||||||
|
|
||||||
|
|||||||
@ -1,3 +0,0 @@
|
|||||||
[user]
|
|
||||||
name = Christoffer Martinsson
|
|
||||||
email = cm@cmtec.se
|
|
||||||
@ -3,5 +3,5 @@
|
|||||||
email = christoffer.martinsson@mildef.com
|
email = christoffer.martinsson@mildef.com
|
||||||
|
|
||||||
[credential "https://git.mildef.com"]
|
[credential "https://git.mildef.com"]
|
||||||
helper = store
|
helper = store --file ~/.my-credentials
|
||||||
username = christoffer
|
username = christoffer
|
||||||
|
|||||||
@ -45,7 +45,7 @@ set-option -sg escape-time 1
|
|||||||
set-option -g focus-events on
|
set-option -g focus-events on
|
||||||
|
|
||||||
# set -g allow-passthrough on
|
# set -g allow-passthrough on
|
||||||
set -g extended-keys on
|
# set -g extended-keys on
|
||||||
set -g status-interval 2
|
set -g status-interval 2
|
||||||
set -g status-bg "#0c0c0c"
|
set -g status-bg "#0c0c0c"
|
||||||
set -g status-fg "#6c6c6c"
|
set -g status-fg "#6c6c6c"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user