Pull the correct branch

This commit is contained in:
Oliver Davies 2015-10-19 10:45:20 +01:00
parent d91db8d449
commit c17ab33ce9

View file

@ -59,7 +59,7 @@
# Checkout the latest develop branch and update it. # Checkout the latest develop branch and update it.
pull-develop = !git checkout develop && git pull --rebase pull-develop = !git checkout develop && git pull --rebase
# Checkout the latest master branch and update it. # Checkout the latest master branch and update it.
pull-master = !git checkout develop && git pull --rebase pull-master = !git checkout master && git pull --rebase
# Update the develop, master and current branches. # Update the develop, master and current branches.
pull-develop-master-current-branch = !BRANCH=$(git current-branch) && \ pull-develop-master-current-branch = !BRANCH=$(git current-branch) && \
git fetch --all && git pull-develop && git pull-master && \ git fetch --all && git pull-develop && git pull-master && \