From 1bf5ef9dea58e113266343c33da35b3cd22d7e51 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 27 Feb 2018 12:10:21 -0400 Subject: 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. --- contrib/post-merge-hook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib/post-merge-hook') 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 } -- cgit v1.2.3