diff --git a/.githooks/post-merge b/.githooks/post-merge index c16246315feba91ebca1be0d3dab0bb77cc16b68..0f3a0015eb23df41a3feba6e59c5257fd6ec3f02 100755 --- a/.githooks/post-merge +++ b/.githooks/post-merge @@ -12,6 +12,8 @@ notify 'Loading dconf config' Documents/bin/dconf-load notify 'Configuring Git repo' git config --local status.showUntrackedFiles no +notify 'Setting up Git submodules' +git bull if command -pv vagrant > /dev/null then notify 'Installing Vagrant plugins' diff --git a/README.md b/README.md index 7d8116dc52adc591f5f349f74b11d078b3a26fb0..785d3b07326049fdcbd7fe5fc134280af25ae6a0 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,7 @@ git remote add origin https://git.shore.co.il/nimrod/rcfiles.git/ git fetch git reset --hard origin/master git branch --set-upstream-to=origin/master -git bull -Documents/bin/install-git-hooks +Documents/bin/download-password-db .githooks/post-merge ```