Git snippets

Updated: 2024-03-12

2 min read

Git , CheatSheet

CheatSheet

Commits

More info about commits style

Github Actions

Submodules Sync

name: 'Submodules Sync'

on:
  schedule:
    - cron: "0 * * * *"

jobs:
  sync:
    runs-on: ubuntu-latest

    steps:
      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
      - uses: actions/checkout@v2
        with:
          submodules: true

      - name: Pull & update submodules recursively
        run: |
          git pull --recurse-submodules
          git submodule update --remote --recursive          

      - name: Commit & push changes
        run: |
          git config --global user.name 'Git bot'
          git config --global user.email 'bot@noreply.github.com'
          git commit -am "Auto updated submodule references" && git push || echo "No changes to commit"

Free space in git repo

Download BFG

wget https://repo1.maven.org/maven2/com/madgag/bfg/1.14.0/bfg-1.14.0.jar

Remove history files bigger than 100Kb:

cd repo
java -jar bfg-1.14.0.jar --strip-blobs-bigger-than 100K .
git reflog expire --expire=now --all && git gc --prune=now --aggressive

Removing an entire commit

Replace “SHA” with the reference you want to get rid of. The “^” in that command is literal.

git rebase -p --onto SHA^ SHA

We want to remove commits 2 & 4 from the repo. (Higher the the number newer the commit; 0 is the oldest commit and 4 is the latest commit)

commit 0 : b3d92c5
commit 1 : 2c6a45b
commit 2 : <any_hash>
commit 3 : 77b9b82
commit 4 : <any_hash>

Note: You need to have admin rights over the repo since you are using --hard and -f.

git checkout b3d92c5 Checkout the last usable commit.
git checkout -b repair Create a new branch to work on.
git cherry-pick 77b9b82 Run through commit 3.
git cherry-pick 2c6a45b Run through commit 1.
git checkout master Checkout master.
git reset --hard b3d92c5 Reset master to last usable commit.
git merge repair Merge our new branch onto master.
git push -f origin master Push master to the remote repo.

If didn’t publish changes, to remove the latest commit, do:

git rebase -i HEAD~<number of commits to go back>
git rebase -i <CommitId>~1
git reset --hard HEAD^
git reset --hard commitId
git rebase -i HEAD~5

If already published to-be-deleted commit:

git revert HEAD

Cleanups

git stash clear
git reflog expire --expire-unreachable=now --all
git fsck --full
git fsck --unreachable  # Will show you the list of what will be deleted
git gc --prune=now   # Cleanup unnecessary files and optimize the local repository

Common git commands

git rev-list --all --count # count commits
git clean -fd # To remove all untracked (non-git) files and folders!

Git snippets

On This Page