Skip to content

git.md

Latest commit

 

History

History
84 lines (64 loc) · 1.75 KB

git.md

File metadata and controls

84 lines (64 loc) · 1.75 KB
Raw

Topics to understand

  • git worktree
  • merge strategies

Cheat Sheet

  • delete branch locally git branch -d localBranchName

  • delete branch remotely git push origin --delete remoteBranchName

  • refresh branch list git fetch -p

  • delete all branshes expect master

git branch | grep -v "master" | xargs git branch -D
  • delete all branshes expect master and develop
git branch | grep -vE "master|develop" | xargs git branch -D
  • show content of specific file in prevouis commits
git cat-file -p HEAD~4:registration/admin.py
git cat-file -p c22dd60:registration/admin.py
  • to rebase feature branch
on `feature_branch`
git rebase <main_branch>
git switch <main_branch>
git rebase <feature_branch>
  • to delete branch locally and remote
git branch -D <branch-name>
git push origin --delete <branch-name>
  • code review
git fetch
git switch -c feature/branch --track origin/feature/branch

OR using my fish alias

gt feature-xyz origin/feature-xyz
  • to cherry-pick a specefic file from a specefic commit into your working directory
git checkout <commit_hash> -- /relative/path/to/file.py
  • to undo the last commit
# Uncommit the changes
git reset --soft HEAD~1

# Completely delete the changes
git reset --hard HEAD~1

# then
git push origin -f

Problems i've solved

The Divergant histories problem

the situation is i have 2 remoets one called pk(on github) and the other is orign (on bitbucket) I pushed to pk once with the commit hash f326c0 and didn't push again and worked on the project and I was pushing all the times to origin on bitbucket . now I want to push to pk , what problems could occur and how to resolve them?