Merge branch 'git-merge' into main

src/homework/2.3/branching/merge.sh

@@ -2,7 +2,8 @@
 # display command line options
 
 count=1
-for param in "$*"; do
-    echo "\$* Parameter #$count = $param"
+while [[ -n "$1" ]]; do
+    echo "Parameter #$count = $1"
     count=$(( $count + 1 ))
+    shift
 done

src/homework/2.3/branching/rebase.sh

@@ -3,7 +3,7 @@
 
 count=1
 for param in "$@"; do
-    echo "\$@ Parameter #$count = $param"
+    echo "Next parameter: $param"
     count=$(( $count + 1 ))
 done