summaryrefslogtreecommitdiff
path: root/contrib/post-merge-hook
diff options
context:
space:
mode:
authorJoey Hess2018-02-27 12:10:21 -0400
committerJoey Hess2018-02-27 12:10:21 -0400
commit1bf5ef9dea58e113266343c33da35b3cd22d7e51 (patch)
tree1500b3b0fb31e5384250fce931b0fa862d3dc79e /contrib/post-merge-hook
parentb9020695e8876524d57b555d744a6002cbfc18d3 (diff)
avoid partial commit during merge problem
git can commit in a post-merge hook, but for some reason only supports committing all staged files, not only some.
Diffstat (limited to 'contrib/post-merge-hook')
-rwxr-xr-xcontrib/post-merge-hook2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/post-merge-hook b/contrib/post-merge-hook
index 4bbb1de7..66d006a1 100755
--- a/contrib/post-merge-hook
+++ b/contrib/post-merge-hook
@@ -16,7 +16,7 @@ set -e
commit () {
if [ -n "$(git status --short privdata/relocate config.hs)" ]; then
- git commit privdata/relocate config.hs -m "$1"
+ git commit -m "$1"
fi
}