diff options
Diffstat (limited to 'lib/subcommands/sync.bash')
| -rw-r--r-- | lib/subcommands/sync.bash | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/subcommands/sync.bash b/lib/subcommands/sync.bash index 0413ce4..ed03faa 100644 --- a/lib/subcommands/sync.bash +++ b/lib/subcommands/sync.bash @@ -17,8 +17,12 @@ subcommand() notice "bashtard/sync" "Syncing $BASHTARD_ETCDIR" pushd -- "$BASHTARD_ETCDIR" > /dev/null || return 4 + + git stash git pull origin master || return 4 git submodule update --recursive --remote || return 4 + git stash pop + popd > /dev/null || return 4 # Run a sync for each registered playbook for this host |