update git cheat sheet

Author: copdips

docs/posts/2019/2019-06-19-git-cheat-sheet.md

@@ -6,7 +6,7 @@ categories:
 comments: true
 date:
   created: 2019-06-19
-  updated: 2025-07-09
+  updated: 2025-07-12
 ---
 
 # Git Cheat Sheet
@@ -296,7 +296,7 @@ git config --global http.https://github.com.proxy $internet_proxy
 
 ## GUI
 
-GitForWindows ships with a GUI tool, very cool.
+GitForWindows ships with a GUI tool.
 
 ```bash
 # start git gui tool
@@ -321,8 +321,64 @@ $ cd -
 $ rm -rf old-repository.git
 ```
 
+## Finding a string in the git log
+
+```bash
+git log -Spassword
+```
+
+## Finding where a file was added
+
+- all occurrences (added, modified, deleted):
+
+    ```bash
+    git log -- file_name
+    ```
+
+- only added:
+
+    there're also `A`, `M`, `D`, etc. <https://git-scm.com/docs/git-log#Documentation/git-log.txt---diff-filterACDMRTUXB82308203>
+
+    ```bash
+    git log --diff-filter=A -- file_name
+    ```
+
+## Forcing local master to the same as origin/main
+
+<https://superuser.com/a/273199>
+
+```bash
+git checkout -B main origin/main
+```
+
 ## Ignoring pre-commit hook
 
 ```bash
 git commit --no-verify
 ```
+
+## Change user.email for some repos
+
+For all repos under `~/git` that match a certain pattern `repo_pattern` in the git url, change the user email to `new_email`.
+
+```bash
+new_email="my_new_email@copdips.com"
+repo_pattern="company_name"
+cd ~/git
+all_folders=$(ls -d $PWD/*)
+echo $all_folders | tr ' ' '\n' | while read -r folder ; \
+    do \
+        echo ====== $folder ; cd $folder ; \
+        url=$(git remote get-url origin 2>/dev/null) ; \
+        if [[ -n $url ]] ; then \
+            if [[ $url =~ $repo_pattern ]] ; then \
+                echo ~~~need to change email ; git config user.email $new_email ; \
+            fi ; \
+        fi ; \
+        url= ; cd ~/git ; \
+    done
+```
+
+## bash-git-prompt tweaks
+
+[Some tweaks](../2024/2024-01-05-bash-git-prompt-tweaks.md) I made to [bash-git-prompt](https://github.com/magicmonty/bash-git-prompt). dynamic Python venv path, new var `GIT_MESSAGE`, etc.

docs/posts/2024/2024-01-05-bash-git-prompt-tweaks.md

@@ -8,6 +8,7 @@ categories:
 comments: true
 date:
   created: 2024-01-05
+  updated: 2025-07-12
 description: Some personal tweaks in bash-git-prompt
 ---
 
@@ -21,32 +22,28 @@ Some tweaks I made to [bash-git-prompt](https://github.com/magicmonty/bash-git-p
 
 bash-git-prompt displays the current Python venv folder name within the prompt, among other things. I would like it to display the full path of the current Python venv if the venv is not located in the current folder. This will help prevent me from using the wrong venv when I switch between projects.
 
-To achieve this, I have to modify the `gp_add_virtualenv_to_prompt` function in the `~/.bash-git-prompt/gitprompt.sh` script, as I used the [git clone method](https://github.com/magicmonty/bash-git-prompt#via-git-clone) to install bash-git-prompt.
-
-```diff title="if the venv is not .venv inside current folder, display the full path of the venv. Node and Conda venv are not modified as I don't use them."
-function gp_add_virtualenv_to_prompt {
-  local ACCUMULATED_VENV_PROMPT=""
-  local VENV=""
-  if [[ -n "${VIRTUAL_ENV-}" && -z "${VIRTUAL_ENV_DISABLE_PROMPT+x}" ]]; then
-+    PYTHON_VERSION=$(python --version | cut -d' ' -f2 | cut -d'.' -f1-2)
+To achieve this, add following code into `function gp_add_virtualenv_to_prompt` in `~/.bash-git-prompt/gitprompt.sh` to add Python virtual environment name and version to the prompt.
+
+```diff title="bash_git_prompt_venv.patch" hl_lines="5"
+diff --git a/gitprompt.sh b/gitprompt.sh
+index 978cae7..0f33e0e 100755
+--- a/gitprompt.sh
++++ b/gitprompt.sh
+@@ -649,7 +649,11 @@ function gp_add_virtualenv_to_prompt {
+   local ACCUMULATED_VENV_PROMPT=""
+   local VENV=""
+   if [[ -n "${VIRTUAL_ENV-}" && -z "${VIRTUAL_ENV_DISABLE_PROMPT+x}" ]]; then
+-    VENV=$(basename "${VIRTUAL_ENV}")
 +    if [[ $VIRTUAL_ENV == "$(pwd)/.venv" ]]; then
 +      VENV=$(basename "${VIRTUAL_ENV}")
 +    else
 +      VENV=$VIRTUAL_ENV
 +    fi
++    PYTHON_VERSION=$(python --version | cut -d' ' -f2 | cut -d'.' -f1-2)
 +    VENV="$VENV $PYTHON_VERSION"
-    ACCUMULATED_VENV_PROMPT="${ACCUMULATED_VENV_PROMPT}${GIT_PROMPT_VIRTUALENV//_VIRTUALENV_/${VENV}}"
-  fi
-  if [[ -n "${NODE_VIRTUAL_ENV-}" && -z "${NODE_VIRTUAL_ENV_DISABLE_PROMPT+x}" ]]; then
-    VENV=$(basename "${NODE_VIRTUAL_ENV}")
-    ACCUMULATED_VENV_PROMPT="${ACCUMULATED_VENV_PROMPT}${GIT_PROMPT_VIRTUALENV//_VIRTUALENV_/${VENV}}"
-  fi
-  if [[ -n "${CONDA_DEFAULT_ENV-}" ]]; then
-    VENV=$(basename "${CONDA_DEFAULT_ENV}")
-    ACCUMULATED_VENV_PROMPT="${ACCUMULATED_VENV_PROMPT}${GIT_PROMPT_VIRTUALENV//_VIRTUALENV_/${VENV}}"
-  fi
-  echo "${ACCUMULATED_VENV_PROMPT}"
-}
+     ACCUMULATED_VENV_PROMPT="${ACCUMULATED_VENV_PROMPT}${GIT_PROMPT_VIRTUALENV//_VIRTUALENV_/${VENV}}"
+   fi
+   if [[ -n "${NODE_VIRTUAL_ENV-}" && -z "${NODE_VIRTUAL_ENV_DISABLE_PROMPT+x}" ]]; then
 ```
 
 ## New var GIT_MESSAGE
@@ -59,20 +56,35 @@ alias gitpush='git ci -am "$GIT_MESSAGE" ; git push origin $GIT_BRANCH`
 
 So I can just type `gitpush` to commit and push my changes to the remote repo.
 
-To achieve this, I have to add one line right after `GIT_BRANCH` in the `~/.bash-git-prompt/gitprompt.sh` script.
+To achieve this, declare a function `set_git_message` in `~/.bash-git-prompt/gitprompt.sh` to set the `GIT_MESSAGE` variable based on the current branch name. Then, call `set_git_message` in the `updatePrompt` function in the same file to get called upon each prompt re-computation, for e.g. right after the line `export GIT_BRANCH=$(replaceSymbols "${git_status_fields[@]:0:1}")`.
 
-```diff title="add new var GIT_MESSAGE"
-  export GIT_BRANCH=$(replaceSymbols "${git_status_fields[@]:0:1}")
-+  export GIT_MESSAGE=$( [[ "$GIT_BRANCH" == */* ]] && echo "${GIT_BRANCH%/*}/$(echo ${GIT_BRANCH##*/} | sed 's/-/ /g')" || echo "${GIT_BRANCH//-/ }" )
-```
+```bash title="~/.bash-git-prompt/gitprompt.sh"
+# given GIT_BRANCH :  feature/JIRA-123/some-feature
+# got GIT_MESSAGE : feature/JIRA-123: some feature
+function set_git_message() {
+
+# Check if the string contains a '/'
 
-What this line does is:
+  if [[ $GIT_BRANCH == */* ]]; then
+      # If it does, get the substring after the last '/'
+      MSG=${GIT_BRANCH##*/}
+      # Get the prefix by removing the message part from the original string
+      PREFIX=${GIT_BRANCH%/$MSG}
+  else
+      # If it doesn't, the whole string is the message
+      PREFIX=""
+      MSG=$GIT_BRANCH
+  fi
 
-- If the branch name contains `/`, `-` in the left part of the last `/` in the branch name will be converted to space.
-- If the branch name does not contain `/`, all `-` in the branch name will be converted to space.
+# Replace "-" with " " in the message part
 
-For example:
+  MSG=${MSG//-/ }
 
-- branch name `feat/#111/add-new-feature_a` will be converted to message `feat/#111/add new feature_a`.
-- branch name `#111/add-new-feature_a` will be converted to message `#111/add new feature_a`.
-- branch name `add-new-feature_a` will be converted to message `add new feature_a`.
+# Combine prefix and message into the new variable
+  if [[ -z $PREFIX ]]; then
+      export GIT_MESSAGE="$MSG"
+  else
+      export GIT_MESSAGE="${PREFIX}: ${MSG}"
+  fi
+}
+```