diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-08-03 20:57:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-03 20:57:44 -0400 |
| commit | 5c44d40a0c208d706c8cd298ba90019b18841cb3 (patch) | |
| tree | cbf8d6cd357e92bf7074fc82a7abfe9c89b67236 /keyboards/amj40/keymaps/default/updatemerge.sh | |
| parent | 479139f9d4ef981a2f10918f0fb5a2c148ca0c8b (diff) | |
| parent | 088dfb7db5b62831570c20f7e438ba0f0a612b74 (diff) | |
Merge pull request #1540 from fabiant7t/master
amj40 added; my layouts for Let's Split, amj40 and XD75
Diffstat (limited to 'keyboards/amj40/keymaps/default/updatemerge.sh')
| -rwxr-xr-x | keyboards/amj40/keymaps/default/updatemerge.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/keyboards/amj40/keymaps/default/updatemerge.sh b/keyboards/amj40/keymaps/default/updatemerge.sh new file mode 100755 index 0000000000..da5457e195 --- /dev/null +++ b/keyboards/amj40/keymaps/default/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 |