diff options
| author | Alan Pearce | 2018-04-27 18:05:51 +0200 |
|---|---|---|
| committer | Alan Pearce | 2018-04-27 18:05:51 +0200 |
| commit | 79cdd5c103d4aad1c3185cecf82893df30e60f6c (patch) | |
| tree | f620243789a88449aedf64bcb397b8d92cd665fc /git | |
| parent | cb6616a19c4d49762defd3d59ebf4cba749479c2 (diff) | |
| download | dotfiles-79cdd5c103d4aad1c3185cecf82893df30e60f6c.tar.lz dotfiles-79cdd5c103d4aad1c3185cecf82893df30e60f6c.tar.zst dotfiles-79cdd5c103d4aad1c3185cecf82893df30e60f6c.zip | |
git: add merge driver for npm lockfiles
Diffstat (limited to 'git')
| -rw-r--r-- | git/.config/git/config | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git/.config/git/config b/git/.config/git/config index bdf88f5..464018b 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -48,3 +48,6 @@ [gpg] program = gpg +[merge "npm-merge-driver"] + name = automatically merge npm lockfiles + driver = npx npm-merge-driver merge %A %O %B %P |