commit 88633fad5b1805e6d4e1ed1f41eb591bcd0add13 Author: rl1987 rl1987@sdf.lonestar.org Date: Fri Mar 1 17:58:10 2019 +0200

Write a comment for post-merge.git-hook --- scripts/maint/post-merge.git-hook | 8 ++++++++ 1 file changed, 8 insertions(+)

diff --git a/scripts/maint/post-merge.git-hook b/scripts/maint/post-merge.git-hook index 475a10f59..5c3efe8ba 100755 --- a/scripts/maint/post-merge.git-hook +++ b/scripts/maint/post-merge.git-hook @@ -1,5 +1,13 @@ #!/bin/sh

+# This is post-merge git hook script to check for changes in: +# * git hook scripts +# * helper scripts for using git efficiently. +# If any changes are detected, a diff of them is printed. +# +# To install this script, copy it to .git/hooks/post-merge in local copy of +# tor git repo and make sure it has permission to execute. + git_toplevel=$(git rev-parse --show-toplevel)

check_for_diffs() {