GIT.md

Git

branch - List, create, or delete branches

# List both remote-tracking branches and local branches (-a || --all)
# with sha1 and commit subject line for each head (-v || -vv || --verborse)
git branch -av

# List branches that are already merged in the current branch (ex. master)
git checkout master
git branch --merged
git branch -d old-merged-feature

# List branches that are not merged in the current branch (ex. master)
git checkout master
git branch --no-merged
git branch -D old-abandoned-feature

# Delete all local branches except master
git branch | grep -v "master" | xargs git branch -D

# Update the local list of remote branches
git remote update origin --prune

config - Get and set repository or global options

# Check your settings
git config --list

# Set your identity
git config --global user.name "Benjamin Rancourt"
git config --global user.email benjamin.rancourt@email.com

# Set Vim as default editor for Git
git config --global core.editor vim

# Set some useful aliases (https://git-scm.com/book/tr/v2/Git-Basics-Git-Aliases)
git config --global alias.co checkout
git config --global alias.br branch
git config --global alias.ci commit
git config --global alias.st status

# https://www.stefanjudis.com/snippets/a-git-alias-to-show-a-detailed-git-branch-overview/
git config --global alias.zup "for-each-ref --sort='authordate:iso8601' --format='%(color:green)%(authordate:relative)%09%(color:white)%(refname:short) / %(contents:subject)' refs/heads"

## Unstage a file (git unstage fileA)
git config --global alias.unstage 'reset HEAD --'

## See the last commit easily (git last)
git config --global alias.last 'log -1 HEAD'

## Set the push default config to simple
git config --global push.default simple

## Add Git completion
cd ~ && wget https://raw.githubusercontent.com/git/git/master/contrib/completion/git-completion.bash
echo "source ~/git-completion.bash" >> ~/.bashrc

## Add Git branch name to bash prompt
# Follow instructions on https://coderwall.com/p/fasnya/add-git-branch-name-to-bash-prompt

fetch - Download objects and refs from another repository

# After fetching, remove any remote-tracking references that no longer exist on the remote (-p || --prune)
git fetch -p

# Fetch all branches from all remote
git feth --all

remote - Manage set of tracked repositories

# List tracked repositories with urls (-v || --verbose)
git remote -v

# Remove and add origin
git remote remove origin
git remote add origin git@github.com:ranb2002/notes.git

# Update the origin
git remote set-url origin git@github.com:ranb2002/udes-language-mixin.git