summaryrefslogtreecommitdiff
path: root/contrib/post-merge-hook
AgeCommit message (Collapse)Author
2018-02-27avoid partial commit during merge problemJoey Hess
git can commit in a post-merge hook, but for some reason only supports committing all staged files, not only some.
2018-02-04Last release mistakenly contained my personal branch not master.Joey Hess
* 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.
2016-03-07privdata/relocateJoey Hess
better than symlinks because this way no conflict can ever occur and, commit from hook