punkfairie/install.fairie
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dotfiles/.local/share/chezmoi/home/private_dot_config/git/config.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiexternal.toml

Browse source
This commit is contained in:
Brian Zalewski 2022-11-24 22:09:56 +00:00
parent a8096a8874
commit ffe43cbc76
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dotfiles/.local/share/chezmoi/home/.chezmoiexternal.toml
View file

@ -77,7 +77,13 @@
[".local/src/shared-common"] [".local/src/shared-common"]
type = "git-repo" type = "git-repo"
url = "https://gitlab.com/megabyte-labs/common/shared.git" url = "https://gitlab.com/megabyte-labs/common/shared.git"
refreshPeriod = "{{ $refreshPeriod }}" clone.args = ["--depth", "1"]
pull.args = ["--ff-only"]
### CookieCutter Template
[".config/git/template"]
type = "git-repo"
url = "https://gitlab.com/megabyte-labs/templates/cookiecutter.git"
clone.args = ["--depth", "1"] clone.args = ["--depth", "1"]
pull.args = ["--ff-only"] pull.args = ["--ff-only"]

2
dotfiles/.local/share/chezmoi/home/private_dot_config/git/config.tmpl
View file

@ -112,7 +112,7 @@
autocorrect = 20 autocorrect = 20
[init] [init]
defaultBranch = master defaultBranch = master
templatedir = ~/.config/git/template templatedir = ${XDG_CONFIG_HOME}/.config/git/template
[interactive] [interactive]
diffFilter = delta --color-only --features=interactive diffFilter = delta --color-only --features=interactive
[merge] [merge]