diff --git a/README.md b/README.md index a1971502..874c3258 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,15 @@ The CPU-only version will automatically be compiled if CUDA cannot be detected b * CMake 3.5.1 * The CPU version should be a lot more forgiving concerning GCC/G++ or Boost versions. +## Git repository set-up (branch marian-integration only) +Branch _marian-integration_ now contains marian as a sub-module. + +After the initial clone or checkout of this branch, run the following command +```bash +git submodule update --init --recursive +``` +If you want git to always update the submodules at git checkout, git pull, git merge, etc. (it won't by default, wich often causes confusion), copy the script ```git-hooks/post-rewrite``` into ```./git/hooks``` and make it executable. + ## Compilation The project is a standard Cmake out-of-source build: diff --git a/marian b/marian index 097a40a8..9fc7df15 160000 --- a/marian +++ b/marian @@ -1 +1 @@ -Subproject commit 097a40a8404f6061545c76db846e1d6bf1c35ed3 +Subproject commit 9fc7df1576bc869a6dc6a5e795e71bbec77cb29a