diff options
| author | cbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info> | 2016-08-22 13:16:49 -0400 |
|---|---|---|
| committer | cbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info> | 2016-08-22 13:16:49 -0400 |
| commit | 90abe70586a3d36bae4d2e3a1f1a02cc64d8925e (patch) | |
| tree | a2008718ea0845edfa15942cdd6180d8d5128815 /keyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh | |
| parent | 3cb1dce62238084c523763a9fc04ed7112525819 (diff) | |
| parent | d8c5041f0a3849c96d7e0bfcf7b22e1aba98ac04 (diff) | |
Merge branch 'master' of 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 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 |