Skip to content

Latest commit

 

History

History
110 lines (79 loc) · 2.12 KB

git.md

File metadata and controls

110 lines (79 loc) · 2.12 KB

My Cheat-sheets

<style> a {font-size:1.5em} </style>

Git

https://github.com/k88hudson/git-flight-rules

Tags

Create a tag
git tag --sign --message "My message" my-tag
List tags
git tag -n
Delete tag
git tag -d my-tag
Push tag
git push origin my-tag
Push all tags (avoid this)
git push --tags

Stash

Save you work for later
git stash
List stashes
git stash list
Apply your latest stash
git stash apply
Apply a spesific stash
git stash apply stash@{2}

Add parts of file

git add --patch <filename>

Rebase

Make sure you have the latest master version
git checkout master
git pull
Back to your branch...
git checkout <mybranch>
Squash my branch first
git rebase -i HEAD~4
git rebase master

Refering to commits

Commit hash: git co c71nd
Local branch: git co develeop
Remote branch: git co origin:develop
Tag: git co v1.2.3
Relative: git co origin:develop~3

Create branch from fork Pull Request

git fetch origin pull/ID/head:BRANCH_NAME

ID being the number of the PR in Github

Remove file from history

git filter-branch --tree-filter 'rm (-rf) filename' HEAD

Pull single file from different ref

git checkout c81nd -- path/to/file.txt

Pushing to a remote branch with a different name

git push origin local-name:remote-name

Undo the act of commiting, but keep changes

git reset --soft HEAD~1

Update remote origin

git remote set-url origin [email protected]:ORG/REPO.git

Permanently discard all local changes

All files
git reset --hard
Some files
git checkout -- file01.txt file02.txt

Find a uncommitted but staged file that was lost (reset --hard)

git fsck --full --unreachable --no-reflog | grep blob | cut -d " " -f 3 | xargs -I {} git cat-file -p {} | grep "test_create_complex_array()" -C 200