summaryrefslogtreecommitdiff
path: root/keyboards/satan
diff options
context:
space:
mode:
authorToni <jeder@mail1a.de>2016-07-17 15:10:14 +0200
committerToni <jeder@mail1a.de>2016-07-17 15:10:14 +0200
commitdb7aa91e767c5ee63c72a4d49b02369ab7e887f2 (patch)
tree99a0c022e47693e9885dce30215ae00a26d12b3d /keyboards/satan
parentde96513ff2f12e56a572b6f54db548725194c10b (diff)
helper file for me to stay up-to-date with master
Diffstat (limited to 'keyboards/satan')
-rwxr-xr-xkeyboards/satan/keymaps/iso_split_rshift/updatemerge.sh4
1 files changed, 4 insertions, 0 deletions
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 0000000000..d17ec76ecd
--- /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