diff options
| author | peepeetee <43021794+peepeetee@users.noreply.github.com> | 2022-04-20 03:19:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-20 05:19:34 +1000 |
| commit | bd8220e9fc871d7997f1565858bb7b3c77756237 (patch) | |
| tree | ec07a369e9d72168c0c491e2030a4ff798a5df9d /keyboards/amjkeyboard/amj40/keymaps/myee/updatemerge.sh | |
| parent | 314865f83366fbaa547540154e0d2a48e7a2e72c (diff) | |
move amj keyboards into amjkeyboard vendor folder (#15733)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/amjkeyboard/amj40/keymaps/myee/updatemerge.sh')
| -rw-r--r-- | keyboards/amjkeyboard/amj40/keymaps/myee/updatemerge.sh | 4 |
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 |