summaryrefslogtreecommitdiff
path: root/keyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh
diff options
context:
space:
mode:
authorXyverz2016-08-19 22:50:55 -0700
committerXyverz2016-08-19 22:50:55 -0700
commit70d4ea7904ef6063b83b34985294a9b9e578be62 (patch)
treeb183763c85a581c7213cd2c247a9f30a75ee0576 /keyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh
parente4984f65decbd005d147d29b56d7a0c7d7a8dafd (diff)
parenta3a312f8f4f4d836de494fe3502ea3175ba2a22c (diff)
Merge remote-tracking branch 'upstream/master'
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 000000000..da5457e19
--- /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