Cleanup Branches

text.md

1. Go to the remote repo and delete outdated branches

2. Then either:

   • Locally cleanup only merged branches: git branch --merged | grep -v "\*" | xargs -n 1 git branch -d
   • Locally remove fetched, outdated branches: git for-each-ref --format='%(refname:short) %(upstream)' refs/heads/ | awk '$2 !~/^refs\/remotes/' | xargs git branch -D”

I might add...

3. Convince people to work against branches on a fork of the repo, so cluttering the project repo is never an issue.

# Setup remotes
$ git remote add upstream git@github.com:org/repo.git
$ git remote set-url upstream --push OMG_NO!
$ git remote -v
origin	git@github:username/repo.git (fetch)
origin	git@github:username/repo.git (push)
upstream	git@github.com:org/repo.git (fetch)
upstream	OMG_NO! (push)

# Create a branch on your fork and do some things
$ git checkout -b my_devel_branch
$ git commit -a -m "Wow, -a? Terrible habit"

# Sync your master with upstream master
$ git fetch upstream
$ git checkout master
$ git merge upstream/master # If your master HEAD is a common ancestor of the upstream HEAD, this becomes just a fast-forward merge

#  Rebase your branch on master
$ git checkout my_devel_branch
$ git rebase master
First, rewinding head to replay your work on top of it...
Fast-forwarded my_devel_branch to master.

# Push your branch back to github
$ git push origin my_devel_branch

# GitHub will detect the new branch and give you a link to create a PR against
# org/master (or whatever the default branch is) and name/master for repo.git

Of course this is git, so there are variations on that^^ workflow. Like using git branch --set-upstream-to && git pull on master