Improved script

2015-04-07 16:08:33 +02:00
parent 736534150a
commit 98bc70d8d1
1 changed files with 1 additions and 1 deletions
@@ -31,7 +31,7 @@ fi
 trap 'echo "(aborting the merge now)" && git merge --abort' EXIT

 echo ".. Test merging of the branch \"$branch\"..."
-git merge --no-commit "$branch" && git status && git diff --staged --summary
+git merge --no-ff --no-commit "$branch" && git status && git diff --staged --summary

 if true; then # REMOVE
 echo '.. Testing permissions...'