Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add delete-squashed-branches command #924

Merged
merged 3 commits into from
May 27, 2021
Merged

Add delete-squashed-branches command #924

merged 3 commits into from
May 27, 2021

Conversation

allejo
Copy link
Contributor

@allejo allejo commented May 24, 2021

Uses https://github.com/not-an-aardvark/git-delete-squashed as a basis for deleting "squashed-merged" branches.

Fixes #858


I hope I'm not too far off with this PR.

Commands.md Outdated
Deletes branches that have been "squashed-merged" into a specified branch

```bash
$ git delete-squashed-branches main
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should also update the doc

Copy link
Contributor Author

@allejo allejo May 25, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does this sound to you? 6867c79

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also need to update the output of git delete-squashed-branches main?
Would be better if we use $ (branch) git ... to indicate the branch change.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure! Is this a new convention or are there other commands that do this too?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. But I think this way will be more clear.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does this sound to you?

```bash
$ (feature-branch) git delete-squashed-branches main
Deleted branch dependabot/bundler/kramdown-2.3.1 (was 1d3fb00).
Deleted branch dependabot/bundler/rexml-3.2.5 (was a7e4052).
$ (main) git ...
```

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alrighty! Amended to my last commit

@allejo allejo requested a review from spacewander May 27, 2021 08:27
@spacewander spacewander merged commit cd8fe4f into tj:master May 27, 2021
@allejo allejo deleted the feature/delete-squashed-branches branch May 29, 2021 09:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

git delete squashed branches
2 participants