From b2780372016d4984a320ef0725a0a831cd63fb05 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Fri, 22 Jul 2016 15:00:27 +0200
Subject: gitconfig: Add git up alias

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

diff --git a/.gitconfig b/.gitconfig
index 679f9da..ecbb5bb 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,6 +16,7 @@
 	ds = diff --stat
 	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
 
 [pretty]
 	fixes = Fixes: %h (\"%s\")
-- 
cgit v1.2.3-54-g00ecf