diff options
| author | Josh Colbeck <skrymir@gmail.com> | 2017-02-21 20:31:16 -0600 |
|---|---|---|
| committer | Josh Colbeck <skrymir@gmail.com> | 2017-02-21 20:31:16 -0600 |
| commit | e51001efcc3ff8b64f8264e8bd4c2dbea15f3364 (patch) | |
| tree | bdf5a0a4b44d5e63ba1376b70d94f64c77f3c90c /keyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh | |
| parent | c56693f858cb3409e4a68a8e65a1370c022a51ed (diff) | |
| parent | 7ff41df32c29bca4e3a6efc3047b8fa93bb99b92 (diff) | |
Merge remote-tracking branch 'qmk/master'
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 0000000000..da5457e195 --- /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 |