diff options
| author |  dbroqua <dbroqua@mousur.org> | 2016-08-23 13:39:49 +0200 |
|---|---|---|
| committer | dbroqua <dbroqua@mousur.org> | 2016-08-23 13:39:49 +0200 |
| commit | e65252d591b88f3c108d40ea5eeda9d561bc237c (patch) | |
| tree | 6e43f93f62aef905c2c5beeb46ef37a18c38e7e0 /keyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh | |
| parent | 92fe78a5ea98cc8ca36d74ce86c24fe284729c39 (diff) | |
| parent | fb4452c2f5a80720fd56306ea4fa7c61a5e8040d (diff) | |
| download | qmk_firmware-e65252d591b88f3c108d40ea5eeda9d561bc237c.tar.gz | |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# keyboards/planck/keymaps/dbroqua/keymap.c
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 |