lytedev/dotfiles
Archived
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

Finally get multiple gitconfigs layering

Browse source
This commit is contained in:
Daniel Flanagan 2021-11-09 09:11:40 -06:00
parent 4c032ab8c1
commit 547aed390b
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
3 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/envs
View file

@ -21,3 +21,4 @@ host/laptop/divvy-macbook
host/laptop/postmates-macbook host/laptop/postmates-macbook
host/laptop/uber-macbook host/laptop/uber-macbook
host/laptop/val-macbook host/laptop/val-macbook
host/personal

36
common/git/config
View file

@ -1,6 +1,5 @@
[user] [user]
name = Daniel Flanagan name = Daniel Flanagan
email = daniel@lyte.dev
[filter "lfs"] [filter "lfs"]
clean = git-lfs clean -- %f clean = git-lfs clean -- %f
@ -9,14 +8,14 @@
required = true required = true
[core] [core]
editor = nvim editor = $EDITOR
excludesfile = /home/daniel/.home/.gitignore excludesfile = /home/daniel/.home/.gitignore
[http "https://gopkg.in"] [http "https://gopkg.in"]
followRedirects = true followRedirects = true
[diff] [diff]
tool = nvimdiff tool = $EDITOR -d
[difftool] [difftool]
prompt = false prompt = false
@ -34,8 +33,8 @@
ds = diff --staged ds = diff --staged
dt = difftool dt = difftool
f = fetch f = fetch
l = log --pretty=format:'%h %ad%x09%an%x09%s' --date=short --decorate l = log --graph --abbrev-commit --decorate --oneline --all
graph = log --graph --abbrev-commit --decorate --oneline --all plainlog = log --pretty=format:'%h %ad%x09%an%x09%s' --date=short --decorate
ls = ls-files ls = ls-files
mm = merge master mm = merge master
p = push p = push
@ -46,38 +45,33 @@
sur = submodule update --remote sur = submodule update --remote
[merge] [merge]
tool = nvimdiff tool = $EDITOR -d
conflictstyle = diff3 conflictstyle = diff3
[mergetool] [mergetool]
prompt = false prompt = false
[mergetool "nvimdiff"] [mergetool "nvimdiff"]
cmd = nvimdiff $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c '$wincmd J' cmd = $EDITOR -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c '$wincmd J'
[pager] [pager]
branch = false branch = false
# remove ansi codes, pad each file's diff with newlines, show as diff, remove top padding # remove ansi codes, pad each file's diff with newlines, show as diff, remove top padding
# diff = nvim -c 'silent %sm/\\e[^mK]*[mK]//g' \ diff = nvim -c 'silent %sm/\\e[^mK]*[mK]//g' \
# -c 'silent %s/^diff/\\r\\rdiff/' \ -c 'silent %s/^diff/\\r\\rdiff/' \
# -c 'silent set ft=diff' \ -c 'silent set ft=diff' \
# -c 'silent execute \"normal gg2dd\"' \ -c 'silent execute \"normal gg2dd\"' \
# -c 'silent setlocal nobuflisted buftype=nofile bufhidden=wipe noswapfile' -c 'silent setlocal nobuflisted buftype=nofile bufhidden=wipe noswapfile'
[commit]
gpgsign = true
[gpg] [gpg]
program = gpg2 program = gpg2
[include]
path = $ENV_PATH/gitconfig
[include]
path = $HOME/.config/lytedev-env/divvy/gitconfig
[color] [color]
ui = auto ui = auto
[push] [push]
default = current default = current
[include]
path = ~/.config/lytedev-env/host-personal/gitconfig
path = ~/.config/lytedev-env/divvy/gitconfig

5
host/personal/gitconfig Normal file
View file

@ -0,0 +1,5 @@
[user]
email = daniel@lyte.dev
[commit]
gpgsign = true