diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-08-19 11:19:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-19 11:19:52 -0400 |
| commit | 7bb9d7f0f9afded61ef968b62115e772651bb1b4 (patch) | |
| tree | 3499dce543d4a35ab1c6906355d995647fbec3d6 /keyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh | |
| parent | 2c59f71090f5053fee389012871bff801c2b0a2e (diff) | |
| parent | bc0bd11430d09423208d5df17dec21e64854cb9a (diff) | |
Merge pull request #660 from toneman77/amj60
new keyboard: AMJ60
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 |