diff options
| author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2016-06-07 23:19:56 +0300 |
|---|---|---|
| committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2016-06-07 23:19:56 +0300 |
| commit | 69adff7509d985ea608afbcb7050328185214c97 (patch) | |
| tree | fa8fc0bf0241879be160df461bf4d4f20e674905 /install_dev_githooks.sh | |
| parent | 1313ff7631138942f1e873adac1b5da105e92448 (diff) | |
Fix yet another bug in the githooks
Diffstat (limited to 'install_dev_githooks.sh')
| -rwxr-xr-x | install_dev_githooks.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/install_dev_githooks.sh b/install_dev_githooks.sh index b43dd6a0..4e7e76d6 100755 --- a/install_dev_githooks.sh +++ b/install_dev_githooks.sh @@ -3,7 +3,7 @@ echo Installing post-merge hook which recursively forces all echo submodules to latest commit after every git pull cat <<EOT >> .git/hooks/post-merge #!/bin/sh -git submodule foreach --recursive 'branch=\$(git config -f \$toplevel/.gitmodules submodule.\$name.branch); [ \"\$branch\" = \"\" ] && branch=master; git checkout \$branch; git merge origin/$branch;' +git submodule foreach --recursive 'branch=\$(git config -f \$toplevel/.gitmodules submodule.\$name.branch); [ \"\$branch\" = \"\" ] && branch=master; git checkout \$branch; git merge origin/\$branch;' EOT chmod +x .git/hooks/post-merge echo Installing custom 'git pull-all' command for recursively |