Adds references and branches slides

Mostly adds slides about references and branches. Also tweaked python
start code and re-aranged / tweaked some existing slides
This commit is contained in:
Jonathan Hodgson 2020-06-12 21:05:59 +01:00
parent 22ef5f581d
commit c6c938207f
9 changed files with 272 additions and 31 deletions

21
shell/differing-branches-simple Executable file
View file

@ -0,0 +1,21 @@
#!/usr/bin/env bash
cd /tmp/demo
echo '$ git switch master'
git switch master
echo '$ vim greeting.py'
sed -i 's/Hello World/HELLO WORLD/g' greeting.py > /dev/null
echo ' # CAPITALISE HELLO WORLD #'
echo '$ git commit -am "Capitalises Hello World"'
git -c color.ui=always commit -am "Capitalises Hello World"
echo '$ git switch test'
git switch test
echo '$ vim greeting.py'
sed -i '3iimport sys\n' greeting.py > /dev/null
echo ' # Adds the line "import sys" #'
echo '$ git commit -am "Adds sys import for arg parsing"'
git commit -am "Adds sys import for arg parsing"
#echo '$ git diff master..test'
#git -c color.ui=always diff master..test
#echo '$ git log --all --oneline --graph'
#git -c color.ui=always log --all --oneline --graph --decorate=short