summaryrefslogtreecommitdiff
path: root/keyboards/amj40/keymaps/default/updatemerge.sh
diff options
context:
space:
mode:
authorBalz Guenat2017-08-07 21:54:06 +0200
committerBalz Guenat2017-08-07 21:54:06 +0200
commitd18df8ef7a7e0528a29fdc96d4843ace54605121 (patch)
tree44f75b9bccd3efa130d622736726a5f1c83531f6 /keyboards/amj40/keymaps/default/updatemerge.sh
parent308bec28bb76f4305d0f084252d7cf207f1b3d83 (diff)
parent933701c2129c0c585ecd8ba37c41b091a7dc687f (diff)
Merge remote-tracking branch 'upstream/master' into bananasplit
# Conflicts: # keyboards/bananasplit/Makefile # keyboards/bananasplit/bananasplit.c # keyboards/bananasplit/bananasplit.h # keyboards/bananasplit/config.h # keyboards/bananasplit/keymaps/default/keymap.c # keyboards/bananasplit/rules.mk
Diffstat (limited to 'keyboards/amj40/keymaps/default/updatemerge.sh')
-rwxr-xr-xkeyboards/amj40/keymaps/default/updatemerge.sh4
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 000000000..da5457e19
--- /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