diff options
| author | Daniel <danielallendeutsch@gmail.com> | 2016-08-31 22:15:47 -0600 |
|---|---|---|
| committer | Daniel <danielallendeutsch@gmail.com> | 2016-08-31 22:15:47 -0600 |
| commit | dbac9f495469854fb64a424b171235e46161d799 (patch) | |
| tree | 8c1b5d5b6e287fdedc5092383333b2ddb44bc4f4 /keyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh | |
| parent | 8019a074cfe39e2bf04c35bb5fb40c9ff9cda9a4 (diff) | |
| parent | e28d151a8a1d458f3c18897c6095decc17b0c3a1 (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 |