propellor/contrib/post-merge-hook, branch master gnusosa's centralized propellor repository for hosts spin-up. https://git.gnusosa.net/propellor/atom?h=master 2018-02-27T16:10:21Z avoid partial commit during merge problem 2018-02-27T16:10:21Z Joey Hess joeyh@joeyh.name 2018-02-27T16:10:21Z urn:sha1:1bf5ef9dea58e113266343c33da35b3cd22d7e51 git can commit in a post-merge hook, but for some reason only supports committing all staged files, not only some. Last release mistakenly contained my personal branch not master. 2018-02-04T15:58:42Z Joey Hess joeyh@joeyh.name 2018-02-04T15:58:42Z urn:sha1:ab7a7f421c9b57b5963a44e57a6a4df7c594aca6 * Last release mistakenly contained my personal branch not master. * contrib/post-merge-hook documentation updated to recommend also using it as a post-checkout hook, to avoid such problems. privdata/relocate 2016-03-08T00:17:18Z Joey Hess joeyh@joeyh.name 2016-03-07T22:40:24Z urn:sha1:0daf924b43d0750b285a5e857eb9946a9a71e6cc better than symlinks because this way no conflict can ever occur and, commit from hook