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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow allow_unrelated_histories option for Base#pull #697

Merged
merged 1 commit into from Mar 14, 2024

Conversation

lHydra
Copy link
Contributor

@lHydra lHydra commented Mar 14, 2024

Your checklist for this pull request

馃毃Please review the guidelines for contributing to this repository.

  • Ensure all commits include DCO sign-off.
  • Ensure that your contributions pass unit testing.
  • Ensure that your contributions contain documentation if applicable.

Description

Add support options for git.pull(...) command. For example, git.pull(origin, branch, allow_unrelated_histories: true) would result in git pull origin branch --allow-unrelated-histories

Also extended the documentation for the #pull method

Signed-off-by: Georgiy Melnikov <melnikov@evrone.com>
@jcouball
Copy link
Member

TruffleRuby and jRuby Windows builds fail for the git-2.x gem at the moment.

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.

Looks great! Currently master goes to 2.x pre-release.

You could either use 2.x pre-release (if you aren't using JRuby on Windows) or let me know and I'll back port this to 1.x.

@jcouball jcouball merged commit 5d4b34e into ruby-git:master Mar 14, 2024
7 of 10 checks passed
@jcouball jcouball changed the title allow to pass options to pull comand Allow allow_unrelated_histories option for Base#pull Mar 15, 2024
@jcouball
Copy link
Member

I pushed git-2.0.0.pre3 to rubygems.org. Give it a try!

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.

None yet

2 participants