summaryrefslogtreecommitdiffstats
path: root/keyboards/amjkeyboard/amj40/keymaps/myee/updatemerge.sh
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/amjkeyboard/amj40/keymaps/myee/updatemerge.sh')
-rw-r--r--keyboards/amjkeyboard/amj40/keymaps/myee/updatemerge.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/keyboards/amjkeyboard/amj40/keymaps/myee/updatemerge.sh b/keyboards/amjkeyboard/amj40/keymaps/myee/updatemerge.sh
new file mode 100644
index 0000000000..da5457e195
--- /dev/null
+++ b/keyboards/amjkeyboard/amj40/keymaps/myee/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