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 cherry support to Git::Log #97

Merged
merged 1 commit into from
Dec 23, 2020
Merged

Add cherry support to Git::Log #97

merged 1 commit into from
Dec 23, 2020

Conversation

peterkovacs
Copy link
Contributor

No description provided.

@rvodden rvodden added this to Far in Roadmap Mar 31, 2018
@stale
Copy link

stale bot commented Apr 1, 2018

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@stale stale bot added the wontfix label Apr 1, 2018
@stale stale bot closed this Apr 8, 2018
Roadmap automation moved this from Far to Won't Do Apr 8, 2018
@europ europ mentioned this pull request Nov 12, 2019
@perlun perlun reopened this Jan 11, 2020
Roadmap automation moved this from Won't Do to Far Jan 11, 2020
@stale stale bot removed the wontfix label Jan 11, 2020
@perlun perlun added the pinned label Jan 11, 2020
@perlun
Copy link
Contributor

perlun commented Jan 11, 2020

@peterkovacs Sorry for the lack of feedback on this one. Do you have a chance to rebase it on top of the latest master version?

@peterkovacs
Copy link
Contributor Author

@perlun No problem. I've rebased and gotten the tests passing.

@jcouball
Copy link
Member

Apologies, it looks like this PR has been sitting for a while. If you want to get it merged, please fix the merge conflicts. I took a look at them and it wasn’t obvious how to fix.

@peterkovacs
Copy link
Contributor Author

Hi @jcouball, no worries. I have rebased the PR onto the latest master. Let me know if there's anything else you need.

@jcouball
Copy link
Member

@peterkovacs sorry to have to come back to you one more time but your commit was missing the DCO sign-off so I merged a few other PRs ahead of this one.

Since I have made several merge commits that I don't want in the commit history, I think you should (1) roll your branch back to your Nov 22nd commit 8382b2b, (2) rebase that with the current master, (3) include the DCO sign-off with the resulting commit, and (4) force push the result.

If there is a better/easier way to clean up the commits, I am open to suggestions.

If you can do this in the next day or so, I'll hold off on any other changes to master so you won't be asked to rebase again.

@jcouball
Copy link
Member

@peterkovacs Sorry again for the bother. I'd love to land this PR for the next release but need your DCO sign off.

Signed-off-by: Peter Kovacs <peter@sanebox.com>
@peterkovacs
Copy link
Contributor Author

@jcouball I think i've done what you're looking for, please let me know if I screwed something up. Thank you!

Copy link
Member

@jcouball jcouball left a comment

Choose a reason for hiding this comment

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

Thanks, @peterkovacs, the PR looks good. Thank you!

@jcouball jcouball merged commit a25eb1a into ruby-git:master Dec 23, 2020
Roadmap automation moved this from Far to Done Dec 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Roadmap
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

3 participants