summaryrefslogtreecommitdiffstats
path: root/keyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh
diff options
context:
space:
mode:
authorToni <jeder@mail1a.de>2016-08-18 13:06:16 +0200
committerToni <jeder@mail1a.de>2016-08-18 13:06:16 +0200
commit387bd772e1a6f24be2239b910979c0a309425400 (patch)
tree83c5a5646b832563fe3c1d45a5ee30254044608b /keyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh
parent8144ce8852f690d5772d80ed2b96ae4af201e266 (diff)
initial commit for the AMJ60 PCB
Diffstat (limited to 'keyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh')
-rwxr-xr-xkeyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/keyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh b/keyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh
new file mode 100755
index 0000000000..da5457e195
--- /dev/null
+++ b/keyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+git checkout amj60 # gets you on branch amj60
+git fetch origin # gets you up to date with origin
+git merge origin/master