4 Commits

Author	SHA1	Message	Date
TheGamerdk	e303759573	fixes (#20602)	2023-10-14 20:46:01 -05:00
TheGamerdk	4ea613ed1b	Update precommit hooks to work in GitHub Desktop (Port) (#8773) ... * Update precommit hooks to work in GitHub Desktop * Add helpful comment * dmi.merge too just in case this helps somehow, not tested though * Update tools/hooks/python.sh Co-authored-by: Ling <lingbleed@gmail.com> Co-authored-by: Tad Hardesty <tad@platymuus.com> Co-authored-by: Ling <lingbleed@gmail.com>	2020-06-07 21:14:37 -04:00
Tad Hardesty	b4c330c24c	Fix hook installation on Linux ... Marks the shell scripts executable and sets nullglob so that the lack of merge drivers doesn't cause shenanigans.	2018-01-30 16:55:37 -08:00
Tad Hardesty	9639061433	Add a new and improved mapmerge (#33869) ... Key benefits of the new mapmerge include: multi-Z support, effective reuse of deleted keys, automatic handling of key overflow, and utilizing a git pre-commit hook to eliminate the need to run batch files manually.	2017-12-28 16:01:34 -05:00