.git-hooks/post-merge | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f4f064da1aec45bb17d01cef59577191923c8ae4
Author: Thomas Klausner <w...@netbsd.org>
Date: Fri Feb 13 16:40:36 2015 +0100
git-hooks: post-merge script does not need /bin/bash
Just use /bin/sh, which exists on more systems.
Change-Id: I5e5453b89841510473414a4c339b647b4f95ae7b
diff --git a/.git-hooks/post-merge b/.git-hooks/post-merge
index 25e62ed..b1be512 100755
--- a/.git-hooks/post-merge
+++ b/.git-hooks/post-merge
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Do not warn if there were no real merge
git rev-parse -q --verify HEAD^2 >/dev/null || exit
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
