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.

Sign up for GitHub

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

Jump to bottom

Fix duplicate declaration of grm, update grb<*> #2183

Closed
wants to merge 1 commit into from
Closed

Fix duplicate declaration of grm, update grb<*> #2183

wants to merge 1 commit into from

Conversation

bittner
Copy link
Contributor

@bittner bittner commented Dec 6, 2022

Description

Consolidates the git rebase aliases thus fixing the unintended overloading of grm. gdel is outphased as an unclear, non-intuitive sibling of gbD (git branch --delete --force).

Motivation and Context

grm is an alias for git rebase due to being redeclared after the first grm (git rm). The redeclaration is a bug.

Closes #2160.

How Has This Been Tested?

n/a

Screenshots (if appropriate):

n/a

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • If my change requires a change to the documentation, I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • If I have added a new file, I also added it to clean_files.txt and formatted it using lint_clean_files.sh.
  • I have added tests to cover my changes, and all the new and existing tests pass.

@bittner
Fix duplicate declaration of grm, update grb<*>
0c4768d 
Consolidates the `git rebase` aliases thus fixing the unintended overloading of `grm`.
`gdel` is outphased as an unclear, non-intuitive sibling of `gbD` (git branch --delete --force).

As discussed in #2160.
davidpfarrell
davidpfarrell approved these changes Dec 12, 2022
View reviewed changes
Copy link
Contributor

@davidpfarrell davidpfarrell left a comment

Choose a reason for hiding this comment

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

This lines up with discussion on the linked issue, so I'm approving - Thanks !

@bittner
Copy link
Contributor Author

bittner commented Dec 13, 2022

Not sure about the bats issue for macOS 11, again.

Apart from that, I would be happy of this PR were merged, thanks! 👍

@davidpfarrell
Copy link
Contributor

The mac jobs are fickle - Re running the failed jobs often results in success - which I just did, so don't make any changes or look at this PR funny and we should be good to go :)

@bittner
Copy link
Contributor Author

bittner commented Dec 20, 2022

Thanks for the approvals! Can we get this merged now?

@bittner bittner closed this by deleting the head repository Sep 22, 2023
@bittner
Copy link
Contributor Author

bittner commented Oct 1, 2023

This PR was closed by mistake. I had deleted my fork to do some cleanup. 🙄 🥲

I'll go ahead and recreate the PR, so that it can be merged.

@bittner bittner mentioned this pull request Oct 1, 2023
Merged
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidpfarrell davidpfarrell davidpfarrell approved these changes

@cornfeedhobo cornfeedhobo cornfeedhobo approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Bug]: Duplicate declaration of grm in git.aliases.bash
3 participants
@bittner @davidpfarrell @cornfeedhobo