From 55c205dfd4e0caa847adb94767b80726b7fb5288 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Tue, 10 Nov 2015 18:53:22 +0000
Subject: [PATCH] gitconfig: Replace push-current-branch with
 upstream-current-branch

---
 .gitconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitconfig b/.gitconfig
index d59d72e..c64d11e 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -39,7 +39,10 @@
 	git fetch --all && git pull-develop && git pull-master && \
 		git checkout $BRANCH && git pull
 
-	push-current-branch = !git push -u $(git upstream) $(git current-branch)
+	# Push the current branch upstream to origin using the same branch
+	# name for the remote branch.
+	upstream-current-branch = !git push --set-upstream origin \
+		$(git current-branch)
 
 	rebase-against-master = !git fetch --all \
 		&& git rebase $(git upstream)/master