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 more merge-ish operations #20

Closed
2 tasks
ajoberstar opened this issue Mar 17, 2014 · 5 comments
Closed
2 tasks

Add more merge-ish operations #20

ajoberstar opened this issue Mar 17, 2014 · 5 comments
Labels
enhancement wontfix

Comments

@ajoberstar
Copy link
Owner

  • Cherry Pick
  • Rebase
@ajoberstar ajoberstar added this to the 0.3.0 milestone Mar 17, 2014
@ajoberstar ajoberstar modified the milestones: wishlist, 0.3.0 Apr 13, 2014
@ajoberstar ajoberstar removed this from the wishlist milestone Oct 10, 2014
@ajoberstar
Copy link
Owner Author

Don't have a use case right now.

@octylFractal
Copy link

I'd like to have rebase if possible, although it is mostly mimicked by merge --no-commit.

@ajoberstar
Copy link
Owner Author

The main reason I backed off on adding more merge options is that I would have implemented them (as with the current merge command) to fail if any conflicts are found. If you think your use case would typically be met without merge conflicts, then adding rebase is something I can put back on the list.

@octylFractal
Copy link

Yes, that would work fine.

@ajoberstar
Copy link
Owner Author

I added #55 for this so that it's scoped down to rebase specifically.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement wontfix
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@ajoberstar @octylFractal