After working with branch per feature for a while any Git-repository becomes a mess of outdated and not finished branches.<\/p>\n\n\n\n
To deal with this issue, we need to clean-up three kinds of branches<\/strong>:<\/p>\n\n\n\n In this tutorial we suppose, that “master” – is a default branch, where everything is merged (for someone it could be “develop”, or “release” branch), and “origin” – it’s a name of remote. If you use different names, just change them in appropriate commands.<\/p>\n\n\n\n At first, list all local branches:<\/p>\n\n\n\n We need to know what branches are already merged in “master” and can be easily removed:<\/p>\n\n\n\n Now, remove all outdated branches with:<\/p>\n\n\n\n Next, decide what to do with not merged branches:<\/p>\n\n\n\n If some of them is just abandoned stuff that you don’t need anymore, remove it with “-D” option:<\/p>\n\n\n\n After each git pull<\/span> or git fetch<\/span> command Git creates references to remote branches in local repository, but doesn’t clean up stale references.<\/p>\n\n\n\n List referenced remote branches:<\/p>\n\n\n\n Clean-up outdated references:<\/p>\n\n\n\n Update repository with:<\/p>\n\n\n\n and Git automatically prunes all stale references.<\/p>\n\n\n\n Usually, remote repository is a big garbage heap of stale branches, if there is no responsible housekeeping person.<\/p>\n\n\n\n After previous git remote prune origin<\/span> we should have synched list of remote branches.<\/p>\n\n\n\n At first, we can find branches which are already merged in “master”:<\/p>\n\n\n\n But this command does not provide much information. What if this branch is merged, but still used for feature development. Would be cool to know last commit date and author.<\/p>\n\n\n\n This magic snippet provides all required information:<\/p>\n\n\n\n Now, you can delete own remote branches, and ask other authors to clean-up theirs:<\/p>\n\n\n\n Similar snippet for not merged branches:<\/p>\n\n\n\n This list should be reviewed more thoroughly to avoid losing important commits.<\/p>\n\n\n\n After the last Github update, Branches<\/strong> page is divided into “Your branches”, “Active branches” and “Stale branches”, and it shows same information as previous commands.<\/p>\n\n\n\n Usually, it’s simple to remove local and appropriate remote branches at once.<\/p>\n\n\n\n This snippet shows only local merged branches, which have appropriate remote merged branches:<\/p>\n\n\n\n More hardcore snippet with date and author information:<\/p>\n\n\n\n Same snippets for not merged branches:<\/p>\n\n\n\n It’s hard to remember such code, so the best way is to create shell scripts and put them in local “bin” folder. Note that these snippets work only in bash(and zsh). For example, let’s put first snippet into “bin\/git-both-merged” file:<\/p>\n\n\n\n Don’t forget to make it executable(chmod 755 git-both-merged<\/span>), and you can also make a git alias for this script. Put next line in .gitconfig:<\/p>\n\n\n\n Now you can call it via git command:<\/p>\n\n\n\n In the same vein you can create git aliases for all snippets from this article.<\/p>\n\n\n\n That’s it, folks. Now, it’s time to clean-up all stale stuff!<\/p>\n","protected":false},"excerpt":{"rendered":" After working with branch per feature for a while any Git-repository becomes a mess of outdated and not finished branches. To deal with this issue, we need to clean-up three kinds of branches: In this tutorial we suppose, that “master” – is a default branch, where everything is merged (for someone it could be “develop”,…<\/p>\n","protected":false},"author":25,"featured_media":9453,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"footnotes":""},"categories":[3],"tags":[],"coauthors":["Sergii Boiko"],"class_list":["post-7187","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-development"],"acf":[],"aioseo_notices":[],"categories_data":[{"name":"Engineering","link":"https:\/\/railsware.com\/blog?category=development"}],"post_thumbnails":"https:\/\/railsware.com\/blog\/wp-content\/themes\/railsware\/vendors\/images\/article-thumbnail-default.jpg","amp_enabled":true,"_links":{"self":[{"href":"https:\/\/railsware.com\/blog\/wp-json\/wp\/v2\/posts\/7187","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/railsware.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/railsware.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/railsware.com\/blog\/wp-json\/wp\/v2\/users\/25"}],"replies":[{"embeddable":true,"href":"https:\/\/railsware.com\/blog\/wp-json\/wp\/v2\/comments?post=7187"}],"version-history":[{"count":25,"href":"https:\/\/railsware.com\/blog\/wp-json\/wp\/v2\/posts\/7187\/revisions"}],"predecessor-version":[{"id":16282,"href":"https:\/\/railsware.com\/blog\/wp-json\/wp\/v2\/posts\/7187\/revisions\/16282"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/railsware.com\/blog\/wp-json\/wp\/v2\/media\/9453"}],"wp:attachment":[{"href":"https:\/\/railsware.com\/blog\/wp-json\/wp\/v2\/media?parent=7187"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/railsware.com\/blog\/wp-json\/wp\/v2\/categories?post=7187"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/railsware.com\/blog\/wp-json\/wp\/v2\/tags?post=7187"},{"taxonomy":"author","embeddable":true,"href":"https:\/\/railsware.com\/blog\/wp-json\/wp\/v2\/coauthors?post=7187"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}\n
Local branches<\/h2>\n\n\n\n
$ git branch\n<\/pre>\n\n\n\n
$ git checkout master\n$ git branch --merged\n<\/pre>\n\n\n\n
$ git branch -d old-merged-feature\n<\/pre>\n\n\n\n
$ git branch --no-merged\n<\/pre>\n\n\n\n
$ git branch -D old-abandoned-feature\n<\/pre>\n\n\n\n
References to remote branches<\/h2>\n\n\n\n
$ git branch -r\n<\/pre>\n\n\n\n
$ git remote prune origin\n<\/pre>\n\n\n\n
Tip<\/h3>\n\n\n\n
$ git fetch -p\n<\/pre>\n\n\n\n
Remote branches<\/h2>\n\n\n\n
$ git checkout master\n$ git branch -r --merged\n<\/pre>\n\n\n\n
$ for branch in `git branch -r --merged | grep -v HEAD`; do echo -e `git show --format=\"%ci %cr %an\" $branch | head -n 1` \\\\t$branch; done | sort -r\n<\/pre>\n\n\n\n
$ git push origin --delete branch-name\n<\/pre>\n\n\n\n
$ for branch in `git branch -r --no-merged | grep -v HEAD`; do echo -e `git show --format=\"%ci %cr %an\" $branch | head -n 1` \\\\t$branch; done | sort -r\n<\/pre>\n\n\n\n
Tip for Github users<\/h3>\n\n\n\n
Bonus snippets<\/h2>\n\n\n\n
$ comm -12 <(git branch --merged|awk '{print($1)}') <(git branch -r --merged|awk '{print($1)}'|awk -F \\\/ '{print($2)}')\n<\/pre>\n\n\n\n$ for branch in `comm -12 <(git branch --merged|awk '{print($1)}') <(git branch -r --merged|awk '{print($1)}'|awk -F \\\/ '{print($2)}')`;do echo -e `git show --format=\"%ci %cr %an\" $branch | head -n 1` \\\\t$branch; done | sort -r\n<\/pre>\n\n\n\n$ comm -12 <(git branch --no-merged|awk '{print($1)}') <(git branch -r --no-merged|awk '{print($1)}'|awk -F \\\/ '{print($2)}')\n<\/pre>\n\n\n\n$ for branch in `comm -12 <(git branch --no-merged|awk '{print($1)}') <(git branch -r --no-merged|awk '{print($1)}'|awk -F \\\/ '{print($2)}')`; do echo -e `git show --format=\"%ci %cr %an\" $branch | head -n 1` \\\\t$branch; done | sort -r\n<\/pre>\n\n\n\nMoving stuff into .gitconfig<\/h2>\n\n\n\n
#!\/usr\/bin\/env bash\n\ncomm -12 <(git branch --merged|awk '{print($1)}') <(git branch -r --merged|awk '{print($1)}'|awk -F \\\/ '{print($2)}')\n<\/pre>\n\n\n\n[alias]\n # ... other aliases\n both-merged = !git-both-merged\n<\/pre>\n\n\n\n
$ git both-merged\n<\/pre>\n\n\n\n