From 884b13bdf6375d1aac1da8f154be58e64306cb7a Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Wed, 29 Apr 2020 13:48:19 +0100
Subject: [PATCH] git: Add aliases for updating local branches

---
 tag-git/gitconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tag-git/gitconfig b/tag-git/gitconfig
index 123b3acc..c7c31878 100644
--- a/tag-git/gitconfig
+++ b/tag-git/gitconfig
@@ -12,8 +12,10 @@
 	current-branch = rev-parse --abbrev-ref HEAD
 	dc = diff --color --word-diff --cached
 	df = diff --color --word-diff
+	dup = !git checkout develop && git fetch origin && echo && git sl develop..origin/develop && echo && git pull --quiet && git checkout -
 	fixup = commit --fixup
 	issues = !hub browse -- issues
+	mup = !git checkout master && git fetch origin && echo && git sl master..origin/master && echo && git pull --quiet && git checkout -
 	nah = !git reset --hard && git clean -fd
 	no-ff = merge --no-ff
 	pl = pull
@@ -21,8 +23,10 @@
 	ps = push
 	pulls = !hub browse -- pulls
 	rbc = rebase --continue
+	rdup = !git dup && git rebase develop
 	remotes = remote -v
 	repush = !git pull --rebase && git push
+	rmup = !git mup && git rebase master
 	ri = rebase --interactive
 	rid = !git rebase -i $(git merge-base develop HEAD)
 	rim = !git rebase -i $(git merge-base master HEAD)