Git Integration Hooks

This folder contains installable scripts for Git hooks and merge drivers. Use of these hooks and drivers is optional and they must be installed explicitly before they take effect.

To install the current set of hooks, or update if new hooks are added, run Install.bat (Windows) or tools/hooks/install.sh (Unix-like) as appropriate.

If your Git GUI does not support a given hook, there is usually a .bat file or other script you can run instead - see the links below for details.

Hooks

• Pre-commit: Runs mapmerge2 to reduce the diff on any changed maps.
• DMI merger: Attempts to fix icon conflicts when performing a Git merge.
• DMM merger: Attempts to fix map conflicts when performing a Git merge.

Adding New Hooks

New Git hooks may be added by creating a file named <hook-name>.hook in this directory. Git determines what hooks are available and what their names are.

New Git merge drivers may be added by adding a shell script named <ext>.merge and updating .gitattributes in the root of the repository to include the line *.<ext> merge=<ext>.

Adding or removing hooks or merge drivers requires running the install script again, but modifying them does not. See existing .hook and .merge files for examples.