added alias' for fetching and merging templates

2021-01-20 16:02:34 +01:00
parent b5cbd2aaa1
commit d55fd85323
1 changed files with 2 additions and 0 deletions
@@ -73,6 +73,8 @@ alias pull='git pull origin'
 alias push='git push origin'
 alias status='git status'
 alias diff='git diff'
+alias ftemplate='git fetch template'
+alias mtemplate='git merge template/master --allow-unrelated-histories'

 #st programs
 alias cubeide='~/st/stm32cubeide_1.5.0/stm32cubeide'