From bd8220e9fc871d7997f1565858bb7b3c77756237 Mon Sep 17 00:00:00 2001 From: peepeetee <43021794+peepeetee@users.noreply.github.com> Date: Wed, 20 Apr 2022 03:19:34 +0800 Subject: move amj keyboards into amjkeyboard vendor folder (#15733) Co-authored-by: Nick Brassel --- keyboards/amjkeyboard/amj40/keymaps/myee/updatemerge.sh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 keyboards/amjkeyboard/amj40/keymaps/myee/updatemerge.sh (limited to 'keyboards/amjkeyboard/amj40/keymaps/myee/updatemerge.sh') 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 -- cgit v1.2.3