summaryrefslogtreecommitdiff
path: root/keyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh
diff options
context:
space:
mode:
authorCallum Oakley2016-09-01 17:55:00 +0100
committerCallum Oakley2016-09-01 17:55:00 +0100
commit9c3193f22555119eb15f63f5ae5efe45e6d7358c (patch)
treea0dcfb3ed442c12a66b444c4c579711660c30657 /keyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh
parent993d72b11fca8d50296570dc85e9354f8045c4a6 (diff)
parente28d151a8a1d458f3c18897c6095decc17b0c3a1 (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