From: Jannik ZANDER <jannikz@gmail.com>
Date: Tue, 7 Aug 2018 15:48:13 +0000 (+0200)
Subject: New git alias up
X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=26e85e89a0520a03b944a8b0e61b8d2c7aa0c61d;p=dotfiles.git

New git alias up
---

diff --git a/.config/git/config b/.config/git/config
index 5f95726..5331f30 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -36,6 +36,9 @@
 	required = true
 [alias]
 # shortcuts
+	pp = "!git pull --rebase && git push"
+	up = "!git pull --rebase --prune $@ && git submodule update --init --recursive"
+	co = checkout
 	co = checkout
 	ci = commit
 	st = status
@@ -57,8 +60,6 @@
 	go = "!f() { git checkout -b \"$1\" 2> /dev/null || git checkout \"$1\"; }; f"
 	diff = diff --word-diff
 	# dont pull without rebase, and dont push without pull (fetch & merge)
-	p = pull --rebase
-	pp = "!git pull --rebase && git push"
 	# avoid merge commits
 	mf = merge --ff-only
 	cp = cherry-pick