commit amend

Author: wilsonmar

git-sample-repo-create.sh

@@ -16,17 +16,18 @@ TMP='git-sample-repo'
 clear
 # Make the beginning of run easy to find:
 echo "**********************************************************"
-echo "******** STEP 01: Delete \"$TMP\" remnant from previous run:"
+echo "******** STEP Delete \"$TMP\" remnant from previous run:"
 rm -rf ${TMP}
 mkdir ${TMP}
 cd ${TMP}
 
+echo "******** Git version :"
+git --version
 echo "******** STEP Init repo :"
 # init without --bare so we get a working directory:
 git init
 # return the .git path of the current project::
 git rev-parse --git-dir
-ls -al
 ls .git/
 
 echo "******** STEP Make develop the default branch instead of master :"
@@ -51,8 +52,6 @@ git config user.email "[email protected]"
 # echo "$GIT_COMMITTER_EMAIL=" $GIT_COMMITTER_EMAIL
 # echo $GIT_AUTHOR_EMAIL
 # Verify settings:
-git config user.name
-git config user.email
 git config core.filemode false
 
 # On Unix systems, ignore ^M symbols created by Windows:
@@ -65,92 +64,98 @@ git config core.editor "~/Sublime\ Text\ 3/sublime_text -w"
 git config color.ui auto
 
 # See https://git-scm.com/docs/pretty-formats :
-git config alias.l "log --pretty='%Cred%h%Creset %C(yellow)%d%Creset | %Cblue%s%Creset | (%cr) %Cgreen<%ae>%Creset' --graph"
-git config alias.s "status -s"
-git config alias.w "show -s --quiet --pretty=format:'%Cred%h%Creset | %Cblue%s%Creset | (%cr) %Cgreen<%ae>%Creset'"
+git config alias.l  "log --pretty='%Cred%h%Creset %C(yellow)%d%Creset | %Cblue%s%Creset' --graph"
+git config alias.s  "status -s"
+#it config alias.w "show -s --quiet --pretty=format:'%Cred%h%Creset | %Cblue%s%Creset | (%cr) %Cgreen<%ae>%Creset'"
+git config alias.w  "show -s --quiet --pretty=format:'%Cred%h%Creset | %Cblue%s%Creset'"
+git config alias.ca "commit -a --amend -C HEAD"
 
 # Have git diff use mnemonic prefixes (index, work tree, commit, object) instead of standard a and b notation:
 git config diff.mnemonicprefix true
+git config rerere.enabled false
 
 # Dump config file:
 # git config --list
 
-echo "******** STEP First commit: a"
+echo "******** STEP commit a1 - README.md :"
 touch README.md
 git add .
-git commit -am "a"
-
-echo "******** STEP Second commit:"
+git commit -m "Add README.md"
+git l -1
+
+echo "******** STEP ammend commit a2 : "
+# ammend last commit with all uncommitted and un-staged changes:
+echo "some more">>README.md
+# Instead of git commit -a --amend -C HEAD
+git ca  # use this alias instead.
+git l -1
+
+echo "******** STEP ammend commit a3 : "
+# ammend last commit with all uncommitted and un-staged changes:
+echo "still some more">>README.md
+# Instead of git commit -a --amend -C HEAD
+git ca  # use this alias instead.
+git l -1
+
+echo "******** STEP commit b - .gitignore :"
 echo ".DS_Store">>.gitignore
-git status
 git add .
-# git status
-git commit -m "b"
-git l
+git commit -m "Add .gitignore"
+git l -1
+git reflog
+ls -al
+cat README.md
 
-echo "******** STEP Third commit: branch F1"
+echo "******** STEP tag & commit branch F1 : --------------------------"
 git tag v1
 git checkout v1 -b F1
-git branch
-git l
+# git branch
+ls .git/refs/heads/
+git l -1
 
-echo "******** STEP Fourth commit: c"
+echo "******** STEP Fourth commit c - LICENSE.md : "
 echo "MIT">>LICENSE.md
 git add .
-git commit -m "c"
-git l
+git commit -m "Add c"
+git l -1
 
 echo "******** STEP commit: d"
 echo "free!">>LICENSE.md
 echo "d">>file-d.txt
 git add .
-git commit -m "d"
-git l
+git commit -m "Add d"
+git l -1
+ls -al
 
-echo "******** STEP Merge:"
-git checkout $DEFAULT_BRANCH
-#git merge F1 --no-commit
+echo "******** STEP Merge F1 :"
+# Instead of git checkout $DEFAULT_BRANCH :
+git checkout @{-1}  # checkout previous branch (develop, master)
+
+git merge F1 --no-ff --no-commit  # to see what may happen
 # git merge F1 --no-ff <:q
-git merge F1 --no-ff
-# Manually type ":q" to exit merge.
-git commit -m "merge F1"
+git merge F1 -m "merge F1" --no-ff  # --no-ff for "true merge".
+# resolve conflicts here?
+git commit -m "commit merge F1"
 git branch
-git l
+git l -1
 
-#echo "******** $NOW Remove Merge branch ref:"
+#echo "******** $NOW Remove merged branch ref :"
 #git branch -d F1
 #git branch
-#git l
+#git l -1
 
 echo "******** STEP commit: e"
 echo "e">>file-e.txt
 git add .
-git status
 git commit -m "e"
-git l
+git l -1
 
 echo "******** STEP commit: f"
 echo "f">>file-f.txt
 ls -al
 git add .
 git commit -m "f"
-
-
-# Undo last commit, preserving local changes:
-# git reset --soft HEAD~1
-
-# Undo last commit, without preserving local changes:
-# git reset --hard HEAD~1
-
-# Undo last commit, preserving local changes in index:
-# git reset --mixed HEAD~1
-
-# Undo non-pushed commits:
-# git reset origin/$DEFAULT_BRANCH
-
-# Reset to remote state:
-# git fetch origin
-# git reset --hard origin/$DEFAULT_BRANCH
+git l -1
 
 
 echo "Copy this and paste to a text edit for reference: --------------"
@@ -188,20 +193,60 @@ git w HEAD~2^2
 echo "******** show HEAD~2^3 :"
 git w HEAD~2^3
 
+# exit
+
 echo "******** Reflog: ---------------------------------------"
 git reflog
+ls -al
+
+exit
 
 echo "******** Create archive file, excluding .git directory :"
 NOW=$(date +%Y-%m-%d:%H:%M:%S-MT)
 FILENAME=$(echo ${TMP}_${NOW}.zip)
 echo $FILENAME
+# Commented out to avoid creating a file from each run:
 # git archive --format zip --output ../$FILENAME  F1
 # ls -l ../$FILENAME
 
+
 echo "******** checkout c :"
 ls -al
+git show HEAD@{5}
 git checkout HEAD@{5}
 ls -al
+git reflog
+
+echo "******** checkout previous HEAD :"
+git checkout HEAD
+ls -al
+
+
+
+# Undo last commit, preserving local changes:
+# git reset --soft HEAD~1
+
+# Undo last commit, without preserving local changes:
+# git reset --hard HEAD~1
+
+# Undo last commit, preserving local changes in index:
+# git reset --mixed HEAD~1
+
+# Undo non-pushed commits:
+# git reset origin/$DEFAULT_BRANCH
+
+
+# git stash save "text message here"
+# git stash list /* shows whats in stash */
+# git stash show -p stash@{0} /* Show the diff in the stash */
+# git stash pop stash@{0} /*  restores the stash deletes the tash */
+# git stash apply stash@{0} /*  restores the stash and keeps the stash */
+# git stash clear /*  removes all stash */
+# git stash drop stash@{0}
+
+# Reset to remote state:
+# git fetch origin
+# git reset --hard origin/$DEFAULT_BRANCH
 
 # echo "******** Cover your tracks:"
 # Remove from repository all locally deleted files: