diff options
| author |  sommerfeld <sommerfeld@sommerfeld.dev> | 2026-05-14 15:32:46 +0100 |
|---|---|---|
| committer | sommerfeld <sommerfeld@sommerfeld.dev> | 2026-05-14 15:32:46 +0100 |
| commit | 3c3393fd755583a4b7cb3b287df384b06bf0e4d6 (patch) | |
| tree | 27229d47b74d06dbbb66a792f245afa91f177834 /remote-dev | |
| parent | 7c50aea6d6991ff085dcfd11e4b42a49d2a63d00 (diff) | |
| download | dotfiles-3c3393fd755583a4b7cb3b287df384b06bf0e4d6.tar.gz dotfiles-3c3393fd755583a4b7cb3b287df384b06bf0e4d6.tar.bz2 dotfiles-3c3393fd755583a4b7cb3b287df384b06bf0e4d6.zip | |
feat(remote-dev): add mergiraf
git config defines a mergiraf merge driver; install it on the VM so
.gitattributes references actually resolve.
Diffstat (limited to 'remote-dev')
| -rw-r--r-- | remote-dev/home.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/remote-dev/home.nix b/remote-dev/home.nix index a85c8f3..0db172b 100644 --- a/remote-dev/home.nix +++ b/remote-dev/home.nix @@ -52,6 +52,7 @@ in git gh delta + mergiraf # JSON / YAML jq |