diff options
| author | Fabian Topfstedt <topfstedt@schneevonmorgen.com> | 2017-07-26 12:46:04 +0200 |
|---|---|---|
| committer | Fabian Topfstedt <topfstedt@schneevonmorgen.com> | 2017-07-26 12:46:04 +0200 |
| commit | 4a1f701d9f3569061d0613599fced54be32b5a54 (patch) | |
| tree | 720e2225694e4417568aab539b9c3191b2a3603f /keyboards/amj40/keymaps/default/updatemerge.sh | |
| parent | de9331c50cb8ec769f7f4fb2eb7a73a435fc4db2 (diff) | |
included amj40 implementation of nhou7 from https://github.com/nhou7/qmk_firmware_amj40
Diffstat (limited to 'keyboards/amj40/keymaps/default/updatemerge.sh')
| -rwxr-xr-x | keyboards/amj40/keymaps/default/updatemerge.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/keyboards/amj40/keymaps/default/updatemerge.sh b/keyboards/amj40/keymaps/default/updatemerge.sh new file mode 100755 index 0000000000..da5457e195 --- /dev/null +++ b/keyboards/amj40/keymaps/default/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 |