diff options
| author | Olivier <olivier@gid0.org> | 2016-08-20 18:07:02 +0200 |
|---|---|---|
| committer | Olivier <olivier@gid0.org> | 2016-08-20 18:07:02 +0200 |
| commit | 009ab77d3e26bd348e45a9a8102b2737c9367979 (patch) | |
| tree | b01491320736c818584098c4b7a6dce8de53f405 /keyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh | |
| parent | 4cfb262faab653247f4d66d44bf5f3339d82bd36 (diff) | |
| parent | a3f726174c0f8f358f7970767a1bf743fd9ad761 (diff) | |
| download | qmk_firmware-009ab77d3e26bd348e45a9a8102b2737c9367979.tar.gz qmk_firmware-009ab77d3e26bd348e45a9a8102b2737c9367979.tar.xz | |
Merge https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh')
| -rwxr-xr-x | keyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh | 4 |
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 |