Advanced Git - Cheat Sheet

Zach Ayers — Wed, 03 Jun 2020 02:21:40 +0000

Advanced Git: Cheat Sheet

Advanced Git: Cheat Sheet
- Go To Previous Branch
- Get History
- Rollback Repo
- Clean Repo
- See Differences Between Branch & Master
- Custom Commits
- Fixup
- Stash
- Helpful Git Aliases

Go To Previous Branch

git checkout -

Get History

# Log in one line
git log --oneline

# Retrieve all commits by message
# Here all commit that contain 'homepage'
git log --all --grep='homepage'

# Retrieve all commit by author
git log --author="Maxence"

Rollback Repo

# Get everything you did
git reflog

# then reset to the desired commit (i.e. HEAD@{4})
git reset HEAD@{4}
# ...or...
git reset --hard <commit-sha1>

Clean Repo

git fetch origin
git checkout master
git reset --hard origin/master
# You're now up-to-date with master!

See Differences Between Branch & Master

git diff master..my-branch

Custom Commits

# Edit last commit
git commit --amend -m "A better message"

# Add something to the last commit without writing message again
git add . && git commit --amend --no-edit

# empty commit - can be useful to re-trigger CI build...
git commit --allow-empty -m "chore: re-trigger build"

Fixup

git add .

git commit --fixup HEAD~1
# or replace HEAD~1 by the commit hash (fed14a4c)

git rebase -i HEAD~3 --autosquash
# save&quit the file (:wq in VI)

Stash

# save all tracked files
git stash save "your message"

# list your stashes
git stash list

# retrieve stash and delete
git stash apply stash@{1}
git stash drop stash@{1}
# ... or in 1 command
git stash pop stash@{1}

Helpful Git Aliases

alias g='git'
alias glog='git log --oneline --decorate --graph'
alias gst='git status'
alias gp='git push'
alias ga='git add'
alias gc='git commit -v'

# 🤘
alias yolo='git push --force'

# useful for daily stand-up
git-standup() {
    AUTHOR=${AUTHOR:="`git config user.name`"}

    since=yesterday
    if [[ $(date +%u) == 1 ]] ; then
        since="2 days ago"
    fi

    git log --all --since "$since" --oneline --author="$AUTHOR"
}

SSH Setup

Zach Ayers — Wed, 06 May 2020 20:02:44 +0000

Module Bundling

Zach Ayers — Wed, 06 May 2020 20:00:37 +0000

DEV Community: Zach Ayers

Advanced Git - Cheat Sheet

Advanced Git: Cheat Sheet

Go To Previous Branch

Get History

Rollback Repo

Clean Repo

See Differences Between Branch & Master

Custom Commits

Fixup

Stash

Helpful Git Aliases

SSH Setup

Module Bundling