summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2018-04-27 18:05:51 +0200
committerAlan Pearce2018-04-27 18:05:51 +0200
commit79cdd5c103d4aad1c3185cecf82893df30e60f6c (patch)
treef620243789a88449aedf64bcb397b8d92cd665fc
parentcb6616a19c4d49762defd3d59ebf4cba749479c2 (diff)
downloaddotfiles-79cdd5c103d4aad1c3185cecf82893df30e60f6c.tar.lz
dotfiles-79cdd5c103d4aad1c3185cecf82893df30e60f6c.tar.zst
dotfiles-79cdd5c103d4aad1c3185cecf82893df30e60f6c.zip
git: add merge driver for npm lockfiles
-rw-r--r--git/.config/git/config3
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