diff --git a/bash/.bashrc b/bash/.bashrc index a561eac..2391f9b 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -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'