]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
helper file for me to stay up-to-date with master
authorToni <jeder@mail1a.de>
Sun, 17 Jul 2016 13:10:14 +0000 (15:10 +0200)
committerToni <jeder@mail1a.de>
Sun, 17 Jul 2016 13:10:14 +0000 (15:10 +0200)
keyboards/satan/keymaps/iso_split_rshift/updatemerge.sh [new file with mode: 0755]

diff --git a/keyboards/satan/keymaps/iso_split_rshift/updatemerge.sh b/keyboards/satan/keymaps/iso_split_rshift/updatemerge.sh
new file mode 100755 (executable)
index 0000000..d17ec76
--- /dev/null
@@ -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