Useful git commands

Useful git-merge commands

# add all renames to staged area in one command 
git status | grep renamed | awk '{ print $4 }' | xargs -L1 git add

# list the branches that are merged
$ git branch --merged

# list the branches that are yet to be merged
$ git branch --no-merge

# delete merged branch
$ git branch -d old-branch

# delete unmerged branches (git would complain with -d)
# the -D is shortcut to -d --force
$ git branch -D old-branch