diff options
| author | Joshua T <joshua@sonofone.net> | 2016-08-24 23:46:52 -0500 |
|---|---|---|
| committer | Joshua T <joshua@sonofone.net> | 2016-08-24 23:46:52 -0500 |
| commit | 42fa91a57dad18ccc3f6bf308f50b3f1e882dadd (patch) | |
| tree | dae1290be66b6af1d498b0cf68fbef44f90d02be /keyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh | |
| parent | cac69cb58029bf246b22038f034205afbedbc695 (diff) | |
| parent | ad206155aa6f87de3fb9f0aefe60685ec12905a8 (diff) | |
Merge remote-tracking branch 'upstream/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 |