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

Add git aliases #9676

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add git aliases #9676

wants to merge 4 commits into from

Conversation

MartinDelille
Copy link
Contributor

Standards checklist:

  • The PR title is descriptive.
  • The PR doesn't replicate another PR which is already open.
  • I have read the contribution guide and followed all the instructions.
  • The code follows the code style guide detailed in the wiki.
  • The code is mine or it's from somewhere with an MIT-compatible license.
  • The code is efficient, to the best of my ability, and does not waste computer resources.
  • The code is stable and I have tested it myself, to the best of my abilities.

Changes:

I added two commands from a git plugin for Fish shell himself based on OMZ.

@ohmyzsh ohmyzsh bot added Area: plugin Issue or PR related to a plugin Plugin: git Topic: alias Pull Request or issue regarding aliases Type: documentation Documentation issue or Pull Request labels Feb 20, 2021
@MartinDelille MartinDelille mentioned this pull request Feb 20, 2021
Open
TheTechRobo
TheTechRobo approved these changes Feb 22, 2021
View reviewed changes
Copy link
Contributor

@TheTechRobo TheTechRobo left a comment •
edited

Choose a reason for hiding this comment

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

A quick once-over looks ok to me, so far, should not have clicked accept changes, untested right now..

TheTechRobo
TheTechRobo reviewed Feb 22, 2021
View reviewed changes
Copy link
Contributor

@TheTechRobo TheTechRobo left a comment •
edited

Choose a reason for hiding this comment

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

What's the difference between glom and glo? They seem to do the same thing.

glo:

image

glom:

image

please don't judge my commit names

@MartinDelille
Copy link
Contributor Author

glom is supposed to list the branch commit since the main branch. It looks like the $(git_main_branch) returned nothing, making it behave like glo.

@MartinDelille
Copy link
Contributor Author

I fixed an issue with glom but in your case you should not have the same result. What does git_main_branch output ?

@TheTechRobo
Copy link
Contributor

@MartinDelille Ah, I was on the master branch. I think that should be listed more clearly what it does.

@MartinDelille
Copy link
Contributor Author

MartinDelille commented Feb 26, 2021 •
edited

@TheTechRobo Done. I took the initiative to add a column for description (some commands might need it).

You can see the output here: https://github.com/MartinDelille/ohmyzsh/tree/add-glom-and-gcfx/plugins/git

@MartinDelille
Copy link
Contributor Author

Anything is blocking the merge of this PR?

@TheTechRobo
Copy link
Contributor

It's not personal that they haven't gotten back to you. They have a huge backlog of PRs to run through.

@MartinDelille
Copy link
Contributor Author

Just a friendly reminder to review my PR! 😉

@MartinDelille MartinDelille changed the title Add gcfx and glom git alias Add git aliases Jun 6, 2021
@MartinDelille
Copy link
Contributor Author

I added three others useful aliases: gsuri/grbmi/grbmia

TheTechRobo
TheTechRobo suggested changes Jun 14, 2021
View reviewed changes
Copy link
Contributor

@TheTechRobo TheTechRobo left a comment •
edited

Choose a reason for hiding this comment

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

Looks like there's trailing whitespace on most of the lines. Would suggest fixing that

plugins/git/README.md Outdated
| glog | git log --oneline --decorate --graph |
| gloga | git log --oneline --decorate --graph --all |
| glp | git log --pretty=\<format\> |
| gm | git merge |
| gmom | git merge origin/$(git_main_branch) |
| gmom | git merge origin/$(git_main_branch) |
Copy link
Contributor

Choose a reason for hiding this comment

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

Trailing whitespace

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm using vim with trailing whitespace highlighted and I can't see any:
Capture d’écran 2021-06-15 à 11 20 05

Am I misunderstanding something?

Copy link
Contributor

Choose a reason for hiding this comment

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

Hmmm.... I see dots on the GitHub "files changed" tab, which for my config means whitespace. I can even highlight it...

image

happens in incognito too

image

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is normal you have trailing space after git merge upstream/$(git_main_branch) because it is followed by about 90 whitespace and the final | of the table.

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh, that makes sense. Sorry.

TheTechRobo
TheTechRobo approved these changes Jun 15, 2021
View reviewed changes
Copy link
Contributor

@TheTechRobo TheTechRobo left a comment

Choose a reason for hiding this comment

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

@robbyrussell @mcornella I believe this is be ready to merge.

@MartinDelille
Copy link
Contributor Author

I didn't noticed that the PR was in conflict => solved!

@mcornella mcornella mentioned this pull request Oct 19, 2021
Closed
@MartinDelille
Copy link
Contributor Author

I solved the conflict and separated gcfx and glom into two separated commits.

@TheTechRobo @LunarWatcher any chance to get this merge ?

@MartinDelille MartinDelille force-pushed the add-glom-and-gcfx branch 2 times, most recently from e6b649f to c19ffb2 Compare August 27, 2022 14:13
@TheTechRobo
Copy link
Contributor

@TheTechRobo @LunarWatcher any chance to get this merge ?

I don't have the power to do that, sorry.

@LunarWatcher
Copy link
Contributor

Yeah, neither me nor TheTechRobo have push rights. You'll just have to wait for @mcornella to get around to it, which can take a while. There's a sizeable backlog and a limited workforce

@MartinDelille
Copy link
Contributor Author

No worries, I'm patient and use my fork in the meantime. I'll just ping again to see if there is some light occasionnaly and fix the potential conflict if it happens again!

@MartinDelille
Copy link
Contributor Author

I just rebased to master hopping it get merge one day! Ping @mcornella

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LunarWatcher LunarWatcher LunarWatcher approved these changes

@TheTechRobo TheTechRobo TheTechRobo approved these changes

Assignees
No one assigned
Labels
Area: plugin Issue or PR related to a plugin Topic: alias Pull Request or issue regarding aliases Type: documentation Documentation issue or Pull Request
Projects
Main project
Status: Backlog
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@MartinDelille @TheTechRobo @LunarWatcher @mcornella