From c17ab33ce93aa8754bb107aa3a56ed0bb4fec755 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Mon, 19 Oct 2015 10:45:20 +0100
Subject: [PATCH] Pull the correct branch
---
.gitconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitconfig b/.gitconfig
index 8860ee88..33c7a304 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -59,7 +59,7 @@
# Checkout the latest develop branch and update it.
pull-develop = !git checkout develop && git pull --rebase
# 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.
pull-develop-master-current-branch = !BRANCH=$(git current-branch) && \
git fetch --all && git pull-develop && git pull-master && \