Skip to content

Instantly share code, notes, and snippets.

@SteveClement
Created November 15, 2019 01:01
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save SteveClement/d59d283bbd9ebcba9fef5b9c4e1cdef4 to your computer and use it in GitHub Desktop.
Save SteveClement/d59d283bbd9ebcba9fef5b9c4e1cdef4 to your computer and use it in GitHub Desktop.
pull, merge and push my MISP branches
#!/usr/bin/env bash
BASE="2.4"
CURRENT_BRANCH=$(git branch | grep ^\* |cut -f 2 -d\ )
git checkout $BASE && git fetch upstream
git merge upstream/$BASE && git push
# gh-pages (not needed, will be done during doc regen)
for branch in $(echo "guides tools i18n INSTALL_19.04 updateObjectTemplates_fix YaraExport_fix test_php REST_Client_python feeds process-atttribute"); do
git checkout $branch
git merge $BASE ; git push
done
git checkout $CURRENT_BRANCH
#git checkout $BASE
if [[ "$1" != "-y" ]]; then
echo -n "Regen install docs? "
read REGEN
if [[ "$REGEN" == "y" ]]; then
cd ../MISP-Official/tools ; git pull
./gen_misp_install_docs.sh
fi
else
cd ../MISP-Official/tools ; git pull
./gen_misp_install_docs.sh
fi
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment