From c4da332192bae16c1e8b469f64432c90c6124f38 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Thu, 28 Nov 2019 14:31:38 +0100
Subject: .gitconfig: make 'git up' rebase on origin/master

---
 .gitconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitconfig b/.gitconfig
index 9ab43a9..c48dc7a 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -18,7 +18,7 @@
 	fixes = show --pretty=fixes -s
 	lp = log -p
 	dist = "!git archive --format=tar -v --prefix=$(git describe HEAD)/ $(git describe HEAD) | bzip2 -9v > ../$(git describe HEAD).tar.bz2"
-	up = pull --rebase --autostash
+	up = pull --rebase --autostash origin master
 	cr = codereview
 	change = codereview change
 	gofmt = codereview gofmt
-- 
cgit v1.2.3-54-g00ecf