package.json: also configure git update-hash-mergetool
Installing will setup git hooks, so we can do one step further and also configure the mergetool
Showing
... | @@ -13,6 +13,6 @@ | ... | @@ -13,6 +13,6 @@ |
"lint-staged": "^12.1.2" | "lint-staged": "^12.1.2" | ||
}, | }, | ||
"scripts": { | "scripts": { | ||
"prepare": "husky install" | "prepare": "husky install && git config merge.tool update-hash-mergetool && git config mergetool.update-hash-mergetool.cmd './update-hash-mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"' && git config mergetool.update-hash-mergetool.trustExitCode true" | ||
} | } | ||
} | } |
Please register or sign in to comment