diff --git a/Dino_Maksumic/print_name.sh b/Dino_Maksumic/print_name.sh new file mode 100644 index 00000000..3a96c124 --- /dev/null +++ b/Dino_Maksumic/print_name.sh @@ -0,0 +1 @@ +echo "Hello, my name is Dino Maksumic" diff --git a/after-merge.png b/after-merge.png new file mode 100644 index 00000000..749622a7 Binary files /dev/null and b/after-merge.png differ diff --git a/basics.sh b/basics.sh index 022e15b9..2d8b5209 100644 --- a/basics.sh +++ b/basics.sh @@ -283,4 +283,12 @@ dd if=/dev/zero of=foobar count=1 bs=1M netstat -nlp # http://explainshell.com/explain?cmd=iptables+-t+nat+-A+PREROUTING+-p+tcp+--dport+80+-j+REDIRECT+--to-port+8080 + iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-port 8080 +echo "MASTER branch: Dino is working on bash_basics" +pwd +ls +echo "PARALLEL branch: Dino working on bash basics" +pwd +ls -la +