commit 786b38ddbbc2a49cceef1c5d7892c383f324ccc1
author Riccardo Iaconelli <riccardo.iaconelli@qredo.com> Tue Sep 13 15:36:07 2022 +0200
committer Riccardo Iaconelli <riccardo.iaconelli@qredo.com> Tue Sep 13 15:36:07 2022 +0200
tree 746da0fe52bb03c11a8973322a6c80d56a1eae20
parent 8f24f41a1de601eff8f7131978145812e46785bf

fix git merge command

Signed-off-by: Riccardo Iaconelli <riccardo.iaconelli@qredo.com>

asf-site-build.sh

diff --git a/asf-site-build.sh b/asf-site-build.sh
index 718c5f1..d111156 100755
--- a/asf-site-build.sh
+++ b/asf-site-build.sh
@@ -35,7 +35,7 @@
   echo "> please inspect and potentially push the result"
   echo
   echo "git checkout $BRANCHNAME"
-  echo "git checkout asf-site && git merge --fast-forward $BRANCHNAME"
+  echo "git checkout asf-site && git merge $BRANCHNAME"
   echo
   echo "> when you are done, clean up after yourself:"
   echo "git branch -d $BRANCHNAME"