diff options
| author | Matthew Yee <yee.matthew@gmail.com> | 2018-03-16 13:36:17 -0700 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-03-16 16:36:17 -0400 |
| commit | 4dc3a01fcb4401c110e10e3e4015ced856dc7055 (patch) | |
| tree | 494485e53f264c0cb28e784a207f956fa95615bf /keyboards/amj40/keymaps/myee/updatemerge.sh | |
| parent | a3047f1ab35e2e9543dae78cd3336f2cd13e596c (diff) | |
Added my keymap (#2529)
* Added my keymap
* maybe that wasn't quite right.
* Reduced the tap time to register layer
* changed the tapping term that fits my typing speed a little better
* Added retro tapping and reduced tapping term duration
Diffstat (limited to 'keyboards/amj40/keymaps/myee/updatemerge.sh')
| -rw-r--r-- | keyboards/amj40/keymaps/myee/updatemerge.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/keyboards/amj40/keymaps/myee/updatemerge.sh b/keyboards/amj40/keymaps/myee/updatemerge.sh new file mode 100644 index 0000000000..da5457e195 --- /dev/null +++ b/keyboards/amj40/keymaps/myee/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 |