From: Toni <jeder@mail1a.de>
Date: Sun, 17 Jul 2016 13:10:14 +0000 (+0200)
Subject: helper file for me to stay up-to-date with master
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=db7aa91e767c5ee63c72a4d49b02369ab7e887f2;p=qmk_firmware.git

helper file for me to stay up-to-date with master
---

diff --git a/keyboards/satan/keymaps/iso_split_rshift/updatemerge.sh b/keyboards/satan/keymaps/iso_split_rshift/updatemerge.sh
new file mode 100755
index 000000000..d17ec76ec
--- /dev/null
+++ b/keyboards/satan/keymaps/iso_split_rshift/updatemerge.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+git checkout iso_split_rshift # gets you "on branch dmgr2"
+git fetch origin              # gets you up to date with origin
+git merge origin/master