[Git] Snippets

git-snippets.sh

# Git apply diff
pbpaste | git apply

# Nice Git log with tags
git log --oneline --decorate

# Show commit difference between two branches
git log --oneline --decorate master..HEAD

# Log after specific date
git log --after="2018-09-27 10:00"

# View file history (even if deleted)
git log --all --full-history -- path/to/file

# Search files with grep
git ls-files | grep png

# Clean untracked files and directories
git clean -dfx output

# Safer `git push --force`
git push --force-with-lease

# Ignore local changes of tracked file
git update-index --assume-unchanged my_file

# Track changes again
git update-index --no-assume-unchanged my_file

# List all "assume-unchanged" files from current directory
git ls-files -v | grep -E "^[a-z]"
git ls-files -v | grep '^h'

# Empty commit
git commit --allow-empty -m "Trigger build"

# Debug .gitignore
git check-ignore -v my_file

# Create a new branch and switch to it
git checkout -b my_new_branch

# Switch to the previous branch
git checkout @{-1}

# Switch to the previous branch (shorthand)
git checkout -

# Restore the file from other branch
git checkout master -- path/to/file

# VSC as global git editor
git config --global core.editor "code --wait"

# Undo the X number of commits (HEAD~X)
git reset --soft HEAD~1