17. Removing a commit from a branch

Link: => planatenal.nnmcloud.ru/d?s=YToyOntzOjc6InJlZmVyZXIiO3M6MzY6Imh0dHA6Ly9iYW5kY2FtcC5jb21fZG93bmxvYWRfcG9zdGVyLyI7czozOiJrZXkiO3M6NDM6IkdpdCBkZWxldGUgYWxsIGxvY2FsIGJyYW5jaGVzIGV4Y2VwdCBtYXN0ZXIiO30=


So I wrote this command to clean up my git branch list. Because of the -f 3 parameter on cut, this branch name would be truncated to sf. This gives bash a somewhat functional twist.

Notes: If your language is set to something other than English you will need to change gone to the appropriate word. They are not listed in the master branch anymore but still remain in the repository. And an asterisk is not allowed as first character for a branch name, so this filter is exactly what we need. I did ask a question about this and got in less than an hour.

Clean up your local branches after merge and delete in GitHub

They are extremely cheap to create, move and destroy and we should therefore try to leverage this power and encapsulate work in different branches. But sometimes local branches clutter up and you just want to delete all of them except master you can always create new ones matching a branch in the remote repository. Automating this is a perfect bash exercise. Here is what I came up with: Running this command inside a Git repository will delete all local branches except the one you are currently on. This gives bash a somewhat functional twist. That means we cannot use it in pipes, because it will receive no arguments but input. The necessary conversion from input to arguments is exactly what xargs does. It invokes a given program here git branch -D with standard input as arguments. First git branch creates a list of all local branches, then grep is used to filter branches. The -v option negates the filter which means the resulting list contains all branch names not matching the given pattern. In the last pipeline stage git branch -D is invoked for all branches in the filtered list which means all branches except the current one will be deleted. Improved version based on feedback Some nice people added valuable feedback on dev. This works because Git automatically prepends an asterisk to the current branch when listing all branches. And an asterisk is not allowed as first character for a branch name, so this filter is exactly what we need. Besides being simpler and cleaner it is git delete all local branches except master more accurate: Currently the command does not delete branches which contain the name of the current branch as a part of their name. If this is an issue you should probably level up your branch naming game, but it is nice edge case thinking. The better version therefore is: If you have suggestions for further improvement or run into any issues its probably best to comment on the GitHub gist directly.

Let's demonstrate this by pushing our current local branch to a different remote branch named new-branch. First push up the placeholder branch: git checkout placeholder if not on placeholder already git push origin placeholder Then set placeholder to be the github default branch. More arguments like -n 200 will make it faster less total time , but it only reports once every 200 branches, making you think that it is frozen at first while it is not. At work we are using topic branches which are integrated into a few 3 master branches at some point. You might call that something like upstream-master. However, both original and cancelled commits are seen in the history of the branch when using git log command. Then there is a question: how do I clean up my local branches? Instead, you could create a script something like the following:!