diff options
| -rwxr-xr-x | scripts/git-sync | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/git-sync b/scripts/git-sync index a9f07ac..aa1facc 100755 --- a/scripts/git-sync +++ b/scripts/git-sync @@ -23,5 +23,10 @@ if ! git diff --cached --quiet; then git commit -m "git-sync on ${HOSTNAME}" fi -git merge --ff-only +#git merge --ff-only +if ! git merge --quiet --no-edit; then + git merge --abort + exit 1 +fi + git push --quiet |