From f4d53118f6dc6ad05cc113fe82d352d963fde6c4 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sat, 22 Apr 2017 15:36:30 +0300
Subject: [PATCH] - Added git hooks directory and installation instructions to
README, for now just regenerate the SSH config after merge (and therefore
pull).
---
.githooks/post-merge | 4 ++++
README.rst | 3 +++
2 files changed, 7 insertions(+)
create mode 100755 .githooks/post-merge
diff --git a/.githooks/post-merge b/.githooks/post-merge
new file mode 100755
index 0000000..75d4c20
--- /dev/null
+++ b/.githooks/post-merge
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -eu
+. .bashrc
+gen-ssh-config
diff --git a/README.rst b/README.rst
index a7a8c59..ab4805c 100644
--- a/README.rst
+++ b/README.rst
@@ -20,6 +20,9 @@ WARNING: This will overwrite your existing files.
cd ..
rm -r rcfiles
git submodule update --init --recursive
+ cd .githooks/
+ find -type f -exec ln -sf ../../.githooks/{} ../.git/hooks/ \;
+ cd ../
In older versions of Git the paths in the submodules are obsolete and thus need
to be corrected (before fetching them). The correction needs to be done in the
--
GitLab