Git CLI hints

De­vOps and SRE

Git Con­fig

The fol­low­ing com­mand us­es the --global flag and will be ap­plied to the file ~/.gitconfig.

git config --global user.name "Spas Z. Spasov"
git config --global user.email "spas.z.spasov@example.com"
git config --global init.defaultBranch "master"
git config --global remote.origin.prune true

To ap­ply an op­tion to the repository's .git/​​​config, you need to re­move the --global flag.

git config user.email "spas.z.spasov@work.com"
git config remote.origin.prune false

Ap­pend a file to a branch

touch file.name
git add -A 
git commit -am "my update msg" 
git push

How to shrink the .git fold­er

git gc --aggressive --prune                # will perform garbage collection in your repository and prune old objects.
git repack -a -d --depth=250 --window=250  # It's better to use this command, because 'git gc --aggressive' is considered to be bad practice.

Delete all com­mit his­to­ry

git checkout --orphan latest_branch     # Checkout
git add -A                              # Add all the files to the 'current' branch
git commit -am "commit message"         # Commit the changes
git branch -D main                      # Delete the branch 'main'
git branch -m main                      # Rename/move the 'current' branch to main
git push -f origin main                 # Finally, force update your repository

Delete/​​​Remove a branch

git branch -d <branch-name>

Re­move last Com­mit and Push from the Re­mote

git reset --soft HEAD~1
git push -f origin HEAD^:BRANCH_NAME

Now you are ready to push the same changes by a new com­mit.

Copy File from An­oth­er Branch

git restore --source master ./assets/css/src/style.less

Where mas­ter is the name of the branch we want to copy from.

Hard Re­set a Lo­cal Branch

BRANCH="master"

git stash
git fetch --all
git reset --hard FETCH_HEAD
git clean -df        
git checkout "$BRANCH"
git pull --all

Push a New Lo­cal Branch to a Re­mote Git Repos­i­to­ry and Track It

BRANCH="master"

git checkout -b "$BRANCH"
git push -u origin "$BRANCH"

Stash and Pop Changes

BRANCH="master"

git branch             # Check does the curent local repo is attached to a remote branch
git chechout "$BRANCH" # Try to attach to the target "$BRANCH"...

At this stage if Git re­turns some­thing like: "You lo­cal changes will be over­writ­ten… Please com­mit your changes or stash them be­fore you switch the branch­es."

Then you can check­out new branch, like it is shown in the above top­ic: git check­out ‑b "$BRANCH". Then check­out the $BRANCH again, or you can stash your changes, check­out the tar­get $BRANCH (with­out cre­at­ing a new one) and then pop the stash them af­ter the pull of the re­mote changes:

git stash               # Stash the changes
git status              # Check does everything is clean
git checkout "$BRANCH"  # Checkout the target "$BRANCH" again
git stash pop           # Pop the stashed changes
git status              # Check which files are modified

Af­ter that you can com­mit, merge and push your changes.

Ref­er­ences

• Stack Over­flow: How to delete all com­mit his­to­ry in GitHub?
• Stack Over­flow: How to shrink the .git fold­er
• Stack Over­flow: How to clone all re­pos at once from GitHub?
• De­v­Con­nect­ed: How To Un­do Last Git Com­mit
• Stack Over­flow: How can I re­move a com­mit on GitHub?
• Stack Over­flow: How do I copy a ver­sion of a sin­gle file from one Git branch to an­oth­er?
• Free Code Camp: Push a new lo­cal branch to a re­mote Git repos­i­to­ry and track it too
• At­lass­ian Git Tu­to­r­i­al: Un­do­ing Com­mits & Changes
• At­lass­ian Git Tu­to­r­i­al: git stash – Sav­ing Changes
• GitHub Docs: Chang­ing a com­mit mes­sage
• How-To Geek: View the Re­mote URL a Git Repos­i­to­ry
• Su­per User: Change git init de­fault branch name
• Stack Over­flow: When does Git re­fresh the list of re­mote branch­es?

Reg­is­ter: De­vOps and SRE

Идентифициране

Разработване

Авторизиране

Утвърждаване

Spas

Spas

Spas

Spas

5.07.2022

3.03.2023

3.03.2023

3.03.2023

27692

32337

32339 32198

32343 32215