From d55fd853234d32d7caba6a184991da63e11108c2 Mon Sep 17 00:00:00 2001
From: paul-loedige <paul@gve-loedige.de>
Date: Wed, 20 Jan 2021 16:02:34 +0100
Subject: [PATCH] added alias' for fetching  and merging templates

---
 bash/.bashrc | 2 ++
 1 file changed, 2 insertions(+)

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'